From 52f8e08715abd234c3bd6908e4338b1da1d8b0b4 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 18 三月 2024 13:35:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java | 79 +++++++++++++++++++++++++++++----------
1 files changed, 58 insertions(+), 21 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java
index 07709a6..572e8ff 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java
@@ -20,6 +20,7 @@
import com.doumee.service.business.ext.ERPSyncService;
import com.doumee.service.business.impl.hksync.HkSyncBaseServiceImpl;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import io.swagger.models.auth.In;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
@@ -48,6 +49,8 @@
private DeviceMapper deviceMapper;
@Autowired
private EmpowerMapper empowerMapper;
+ @Autowired
+ private ParkBookMapper bookMapper;
@Autowired
private MemberCardMapper memberCardMapper;
@Autowired
@@ -209,7 +212,6 @@
model.setOrgIndexCode(c.getHkId());
model.setOrgName(c.getName());
return model;
-
}
/**
@@ -228,7 +230,7 @@
List<String> fIds = new ArrayList<>();
if(result.getData()!=null){
for(OrgUpdateFailureResponse r : result.getData()){
- if(!r.getCode().equals("0x00052102")){
+ if(r.getCode().equals("0x00052102")){
//涓嶅瓨鍦ㄧ殑涔熺畻鍒犻櫎鎴愬姛
fIds.add(r.getOrgIndexCode());//鍒犻櫎澶辫触鐨勬暟鎹泦鍚�
}
@@ -264,10 +266,12 @@
List<Member> list = memberMapper.selectJoinList(Member.class,new MPJLambdaWrapper<Member>()
.selectAll(Member.class )
.selectAs(Company::getHkId,Member::getHkOrgId)
- .isNotNull(Member::getFaceId)
+// .isNotNull(Member::getFaceId
.leftJoin(Company.class,Company::getId,Member::getCompanyId)
.eq(Member::getHkStatus,Constants.ZERO)
+ .eq(Member::getStatus,Constants.ZERO)
.eq(Member::getType,Constants.memberType.internal)
+ .notExists("select d.id from empower d where d.member_id=t.id and d.send_status in (1,5)")//鎺掗櫎鏈夋鍦ㄥ悓姝ヤ笅鍙戜换鍔＄殑鏁版嵁
.orderByAsc(Member::getErpDate));
if(list ==null || list.size()==0){
return;
@@ -303,7 +307,8 @@
String[] ss = doorids.split(",");
try {
for(String s :ss){
- r.add(Integer.parseInt(s));
+ Integer ts =Integer.parseInt(s);
+ r.add(ts);
}
}catch (Exception e){
//鑴忔暟鎹笉澶勭悊
@@ -314,6 +319,16 @@
}
return null;
}
+
+ private static boolean isNorExistInList(Integer ts, List<Integer> list) {
+ for(Integer r :list){
+ if(Constants.equalsInteger(ts,r)){
+ return true;
+ }
+ }
+ return false;
+ }
+
@Transactional
public boolean dealMemberInfoBiz(Member c, Date date, String path) {
if( c.getCompanyId() == null){
@@ -329,13 +344,20 @@
}
return false;
}
- private void dealDelMemberRoleEmpower(Member member ) {
+ private int dealDelMemberRoleEmpower(Member member ) {
//寰呯Щ闄ゆ潈闄愮殑璁惧鏁版嵁鎺堟潈璁板綍锛堥拡瀵瑰垹闄ゅ拰鏇存柊涓㈠け鐨勬潈闄愶紝闇�瑕佸悓姝ヤ笅鍙戝垹闄ゆ潈闄愶級
- empowerMapper.update(null,new UpdateWrapper<Empower>().lambda()
- .eq(Empower::getMemberId,member.getId())
- .set(Empower::getIsdeleted,Constants.ONE)
- .eq(Empower::getIsdeleted,Constants.ZERO)
- .set(Empower::getSendStatus,Constants.ZERO));
+ bookMapper.update(null,new UpdateWrapper<ParkBook>().lambda()
+ .eq(ParkBook::getMemberId,member.getId())
+ .set(ParkBook::getRemark,"绛夊緟鍚屾鍒犻櫎瀹夐槻骞冲彴")
+ .set(ParkBook::getIsdeleted,Constants.ONE)
+ .eq(ParkBook::getIsdeleted,Constants.ZERO)
+ .set(ParkBook::getHkStatus,Constants.ZERO));
+ return empowerMapper.update(null,new UpdateWrapper<Empower>().lambda()
+ .eq(Empower::getMemberId,member.getId())
+ .set(Empower::getIsdeleted,Constants.ONE)
+ .set(Empower::getRemark,"绛夊緟鍚屾鍒犻櫎瀹夐槻骞冲彴")
+ .eq(Empower::getIsdeleted,Constants.ZERO)
+ .set(Empower::getSendStatus,Constants.ZERO));
}
private void dealMemberRoleEmpower(Member member ) {
//澶勭悊鏂板鐨勪汉鍛樺崱鐗囨暟鎹紙涓庢捣搴峰悓姝ワ級
@@ -349,6 +371,12 @@
}
List<Integer> doorIds = getRoleIdByParam(member,deviceRoleMapper);
if(doorIds==null || doorIds.size() == 0){
+ //濡傛灉鏉冮檺娓呯┖锛屽垯娓呯┖浜哄憳鎺堟潈鐨勬潈闄愭暟鎹�
+ empowerMapper.update(null,new UpdateWrapper<Empower>().lambda()
+ .eq(Empower::getMemberId,member.getId())
+ .set(Empower::getIsdeleted,Constants.ONE)
+ .eq(Empower::getIsdeleted,Constants.ZERO)
+ .set(Empower::getSendStatus,Constants.ZERO));
return;
}
if(StringUtils.isBlank(member.getFaceImg())){
@@ -409,7 +437,7 @@
private List<MemberCard> dealMemberHkCard(Member member) {
List<MemberCard> memberCards = memberCardMapper.selectList(new QueryWrapper<MemberCard>().lambda()
.eq(MemberCard::getMemberId,member.getId())
- .eq(MemberCard::getType,Constants.TWO)
+// .eq(MemberCard::getType,Constants.TWO)
.eq(MemberCard::getHkStatus,Constants.ZERO) );
if(memberCards==null || memberCards.size()==0){
//娌℃湁甯﹀鐞嗙殑鏁版嵁锛岀洿鎺ヨ烦杩�
@@ -470,7 +498,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) );
@@ -487,15 +515,21 @@
c.setHkStatus(Constants.ONE);
if(Constants.equalsInteger(Constants.ONE,c.getIsdeleted())){
//澶勭悊鍒犻櫎鏁版嵁锛堝垹闄や箣鍓嶄笅鍙戠殑娴峰悍浜哄憳鏉冮檺淇℃伅锛�
- dealDelMemberRoleEmpower(c);
- c.setHkStatus(Constants.FOUR );
- c.setRemark( "绛夊緟鍒犻櫎鎺堟潈锛�");
- /*boolean r = doHkDeleteUser(c.getId(),c.getHkId(),date);
- c.setHkStatus(r?Constants.ONE:Constants.TWO);
- c.setRemark(r?null:"鍒犻櫎娴峰悍浜哄憳淇℃伅澶辫触锛�");
- c.setIsdeleted(r? Constants.ONE: Constants.ZERO);//鍒犻櫎澶辫触锛屾仮澶嶆暟鎹�
- //鍒犻櫎鎵�鏈夌粦瀹氱殑鍗＄墖淇℃伅
- memberCardMapper.delete(new QueryWrapper<MemberCard>().lambda().eq(MemberCard::getMemberId,c.getId()));*/
+ int rr = dealDelMemberRoleEmpower(c);
+ if(rr >0){
+ //濡傛灉鏈夋瑠闄愬緟鍒櫎锛岀瓑寰呭垹闄ゅ畬鎴愬啀鍒犻櫎浜哄憳
+ c.setHkStatus(Constants.FOUR );
+ c.setRemark( "绛夊緟鍒犻櫎鎺堟潈锛�");
+ }else{
+ //娌℃湁鏉冮檺鐩存帴鍒犻櫎浜哄憳
+ boolean r = doHkDeleteUser(c.getId(),c.getHkId(),date);
+ c.setHkStatus(r?Constants.ONE:Constants.TWO);
+ c.setRemark(r?null:"鍒犻櫎娴峰悍浜哄憳淇℃伅澶辫触锛�");
+ c.setIsdeleted(r? Constants.ONE: Constants.ZERO);//鍒犻櫎澶辫触锛屾仮澶嶆暟鎹�
+ //鍒犻櫎鎵�鏈夌粦瀹氱殑鍗＄墖淇℃伅
+ memberCardMapper.delete(new QueryWrapper<MemberCard>().lambda().eq(MemberCard::getMemberId,c.getId()));
+ }
+
}else{
//澶勭悊淇敼鏁版嵁锛屽苟涓旀洿鏂颁汉鑴�
UserAddRequest addHkModel = getUserAddModel(c,path,1);//淇敼
@@ -548,6 +582,7 @@
noticeErpFail(c,Constants.ZERO,"浜鸿劯鐓х墖涓嶅瓨鍦紝鑾峰彇澶辫触锛�");
c.setHkStatus(Constants.TWO);
c.setRemark("浜鸿劯鐓х墖涓嶅瓨鍦紝鑾峰彇澶辫触锛�");
+ c.setHkDate(new Date());
memberMapper.updateById(c);
return false;
}
@@ -557,6 +592,7 @@
c.setFaceId(result.getData().getFaceId());
c.setHkStatus(Constants.ONE);
c.setHkId(addHkModel.getPersonId());
+ c.setHkDate(new Date());
memberMapper.updateById(c);
dealMemberRoleEmpower(c);
return true;
@@ -564,6 +600,7 @@
noticeErpFail(c,Constants.ZERO,"浜哄憳淇℃伅鍚屾瀹夐槻骞冲彴澶辫触锛岃淇鍚庨噸璇曪紒"+result.getCode()+result.getMsg());
c.setHkStatus(Constants.TWO);
c.setRemark("浜哄憳淇℃伅鍚屾瀹夐槻骞冲彴澶辫触锛岃淇鍚庨噸璇曪紒"+(result!=null?result.getMsg():""));
+ c.setHkDate(new Date());
memberMapper.updateById(c);
return false;
}
--
Gitblit v1.9.3