From 9b8baee48d0bdd95ea157be10e7c24711c511dc1 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 19 九月 2025 09:26:03 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java
index 4fa0614..8fe86fe 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java
@@ -10,15 +10,17 @@
import com.doumee.core.haikang.model.param.request.*;
import com.doumee.core.haikang.model.param.respose.*;
import com.doumee.core.haikang.service.HKService;
-import com.doumee.core.model.LoginUserInfo;
+import com.doumee.service.business.third.model.LoginUserInfo;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DESUtil;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.ImageBase64Util;
import com.doumee.dao.business.*;
import com.doumee.dao.business.dao.CompanyMapper;
+import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.join.MemberJoinMapper;
import com.doumee.dao.business.model.*;
+import com.doumee.dao.business.model.Member;
import com.doumee.dao.system.SystemUserMapper;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.ext.ERPSyncService;
@@ -28,7 +30,6 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
-import org.checkerframework.checker.units.qual.C;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -359,7 +360,8 @@
*/
@Override
public void syncMemberDelData(){
- if(Constants.DEALING_HK_DEL_USER || Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) != DataSyncConfig.origin.erp){
+ if(Constants.DEALING_HK_DEL_USER
+ || Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin())== DataSyncConfig.origin.hk){
return ;
}
Constants.DEALING_HK_DEL_USER =true;
@@ -418,14 +420,16 @@
}
Date date = new Date();
for(Member member : list){
+ //涓�鍗￠�氭巿鏉冧笅鍙戠姸鎬� 0寰呬笅鍙� 1宸蹭笅鍙� 2涓嬪彂鎴愬姛 3宸插彇娑� 4涓嬪彂澶辫触 5浠诲姟涓嬭浇宸茬粨鏉�
if(member!=null && Constants.equalsInteger(member.getIsdeleted(),Constants.ONE) ){
if(empowerMapper.selectCount(new QueryWrapper<Empower>().lambda()
.eq(Empower::getMemberId, member.getId())
.eq(Empower::getIsdeleted,Constants.ONE)
.ne(Empower::getFailFlag,Constants.ONE)
- .ne(Empower::getSendStatus,Constants.EmpowerStatus.pass)) ==0) {
- //濡傛灉鏉冮檺閮藉凡缁忓垹闄ゆ垚鍔燂紝鍒欏垹闄ゆ捣搴蜂汉鍛樺拰鍗＄墖鏁版嵁
-
+ .notIn(Empower::getSendStatus
+ ,Constants.EmpowerStatus.pass
+ ,Constants.EmpowerStatus.cancel )) ==0) {
+ //濡傛灉鏉冮檺閮藉凡缁忓垹闄ゆ垚鍔燂紝鍒欏垹闄ゆ捣搴蜂汉鍛樺拰鍗＄墖鏁�
HkSyncEmpowerServiceImpl.doHkDeleteUser(member.getId(),member.getHkId(),date,memberMapper1,memberCardMapper);
}
}
@@ -452,12 +456,11 @@
for(String s :ss){
try {
Integer ts =Integer.parseInt(s);
- r.add(ts);
+ r.add(ts);
}catch (Exception e){
//鑴忔暟鎹笉澶勭悊
}
}
-
}
}
return r;
@@ -535,9 +538,8 @@
//濡傛灉娌℃湁鍗� 涔熸病鏈変汉鑴�
return;
}
-
if(Constants.equalsInteger(member.getIsdeleted(),Constants.ZERO)){
-// && Constants.equalsInteger(member.getHkStatus(),Constants.ONE)){
+ // && Constants.equalsInteger(member.getHkStatus(),Constants.ONE)){
List<Integer> deviceIds =new ArrayList<>();//鏂拌澶囩紪鐮侀泦鍚�
List<Empower> list = new ArrayList<>();//鏂版巿鏉冭褰曢泦鍚�
//濡傛灉鐢ㄦ埛鏄悓姝ユ捣搴锋垚鍔燂紝娣诲姞甯︿笅鍙戞潈闄愶紙鍙鐞嗘柊澧炴垨鑰呯紪杈戠殑锛�
@@ -676,7 +678,6 @@
cr.setCardType(m.getType());
param.getCardList().add(cr);
}
-
//澶勭悊鏂板鏁版嵁
BaseResponse<List<CardInfoResponse>> result = HKService.cardBingding(param);
if(result !=null && StringUtils.equals(result.getCode(),HKConstants.RESPONSE_SUCCEE) ){
@@ -712,7 +713,7 @@
public static List<MemberCard> getNormalCardList(Member member,MemberCardMapper memberCardMapper) {
return memberCardMapper.selectList(new QueryWrapper<MemberCard>().lambda()
.eq(MemberCard::getMemberId,member.getId())
-// .eq(MemberCard::getType,Constants.TWO)
+ // .eq(MemberCard::getType,Constants.TWO)
.eq(MemberCard::getStatus,Constants.MemberCard.normal)
.eq(MemberCard::getHkStatus,Constants.ONE) );
@@ -747,7 +748,7 @@
//澶勭悊鏂板鏁版嵁
BaseResponse result = HKService.editUser(addHkModel);
if(result !=null && StringUtils.equals(result.getCode(),HKConstants.RESPONSE_SUCCEE) ){
- if(StringUtils.isNotBlank(c.getFaceImg()) && Constants.equalsInteger(c.getFaceStatus(),Constants.ZERO)){
+ if(StringUtils.isNotBlank(c.getFaceImg()) && !Constants.equalsInteger(c.getFaceStatus(),Constants.TWO)){
//濡傛灉鏈変汉鑴哥収鐗囷紝澶勭悊浜鸿劯鐓х墖鍚屾
String faceid = dealMemberFace(c,path);
if(StringUtils.isBlank(faceid)){
--
Gitblit v1.9.3