会员合并换绑

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/StaffClerkRelationService.java

@@ -18,6 +18,8 @@ public interface StaffClerkRelationService {
 
     void delMemberQywxFlag(String enterpriseId, List<String> memberIds) ;
 
+    void addMemberQywxFlag(String enterpriseId,String memberId ) ;
+
     /**
      * 解绑-删除绑定（门店级别）
      *

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/StaffClerkRelationServiceImpl.java

@@ -269,6 +269,30 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
     }
 
     @Override
+    public void addMemberQywxFlag(String enterpriseId, String memberId) {
+        List<TabHaobanExternalClerkRelated> memberList = externalClerkRelatedService.getAddTimeByMemberId(memberId, enterpriseId,"1");
+        Date date = new Date();
+        Date opTime = new Date(0);
+        Date firstTime = new Date();
+        if (CollectionUtils.isNotEmpty(memberList)){
+            for (TabHaobanExternalClerkRelated a : memberList){
+                if(null == a.getAddTime()) {
+                    continue;
+                }
+                Date addTime = new Date(a.getAddTime() * 1000L);
+                if ((a.getStatusFlag() == 1 || a.getStatusFlag() == 3 || a.getStatusFlag() == 4) && opTime.before(addTime)){
+                    opTime= addTime;
+                    date = opTime;
+                }
+                if (firstTime.after(addTime)){
+                    firstTime = addTime;
+                }
+            }
+            this.memberApiService.updateMemberQywxEveryOccasion(enterpriseId, memberId, 1, date,firstTime);
+        }
+    }
+
+    @Override
     public boolean delBindByStoreIds(String wxEnterpriseId, Set<String> storeIds, String optStaffId, int channelCode) {
         if (CollectionUtils.isEmpty(storeIds)) {
             logger.info("没有传门店列表：{}", wxEnterpriseId);

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/ExternalClerkRelatedApiServiceImpl.java

@@ -35,6 +35,7 @@ import com.gic.haoban.manage.service.entity.TabHaobanWxEnterprise;
 import com.gic.haoban.manage.service.entity.ext.MemberStaffRelExtDO;
 import com.gic.haoban.manage.service.pojo.QywxTagSyncInfoPojo;
 import com.gic.haoban.manage.service.service.ExternalClerkRelatedService;
+import com.gic.haoban.manage.service.service.StaffClerkRelationService;
 import com.gic.haoban.manage.service.service.WxEnterpriseService;
 import com.gic.haoban.manage.service.service.hm.WxUserAddLogService;
 import com.gic.haoban.manage.service.util.EventUtils;
@@ -103,6 +104,8 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
     private MemberService memberService;
     @Autowired
     private ExternalClerkRelatedService externalClerkRelatedService;
+    @Autowired
+    private StaffClerkRelationService staffClerkRelationService ;
 
     /**
      * 查询会员在企业下的好友关系
@@ -428,6 +431,7 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
                tabHaobanExternalClerkRelatedMapper.updateMemberIdByMemberId(mergeMemberId, memberId, enterpriseId);
                log.info("会员合并 ,更新为企微好友,新memberId:{}", mergeMemberId);
                this.memberApiService.updateMemberQywxFlag(enterpriseId, mergeMemberId, 1);
+               this.staffClerkRelationService.addMemberQywxFlag(enterpriseId,memberId);
            }
        }else if(type==2) {
            int m1 = this.tabHaobanExternalClerkRelatedMapper.countByMemberId(memberId, enterpriseId) ;
@@ -439,11 +443,13 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
                this.tabHaobanExternalClerkRelatedMapper.updateMemberIdByMemberId(memberId, mergeMemberId, enterpriseId);
                log.info("会员换绑 ,更新为企微好友,新memberId:{}", memberId);
                this.memberApiService.updateMemberQywxFlag(enterpriseId, memberId, 1);
+               this.staffClerkRelationService.addMemberQywxFlag(enterpriseId,memberId);
                this.memberApiService.updateMemberQywxFlag(enterpriseId, mergeMemberId, 0);
            }else if(m1>0 && m2==0) {
                this.tabHaobanExternalClerkRelatedMapper.updateMemberIdByMemberId(mergeMemberId, memberId, enterpriseId);
                log.info("会员换绑 ,更新为企微好友,新memberId:{}", mergeMemberId);
                this.memberApiService.updateMemberQywxFlag(enterpriseId, mergeMemberId, 1);
+               this.staffClerkRelationService.addMemberQywxFlag(enterpriseId,mergeMemberId);
                this.memberApiService.updateMemberQywxFlag(enterpriseId, memberId, 0);
            }else if(m1>0 && m2>0) {
                List<String> m1IdList = this.tabHaobanExternalClerkRelatedMapper.getIdList(memberId, enterpriseId) ;
@@ -452,6 +458,8 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
                this.tabHaobanExternalClerkRelatedMapper.updateMemberByIdList(memberId, m2IdList);
                this.memberApiService.updateMemberQywxFlag(enterpriseId, memberId, 1);
                this.memberApiService.updateMemberQywxFlag(enterpriseId, mergeMemberId, 1);
+               this.staffClerkRelationService.addMemberQywxFlag(enterpriseId,memberId);
+               this.staffClerkRelationService.addMemberQywxFlag(enterpriseId,mergeMemberId);
            }
        }
     }