Merge branch 'feature-haoban-role' into 'developer'

会员合并

See merge request !341

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

@@ -413,10 +413,12 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
                this.tabHaobanExternalClerkRelatedMapper.updateMemberIdByMemberId(memberId, mergeMemberId, enterpriseId);
                log.info("会员换绑 ,更新为企微好友,新memberId:{}", memberId);
                this.memberApiService.updateMemberQywxFlag(enterpriseId, memberId, 1);
+               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.memberApiService.updateMemberQywxFlag(enterpriseId, memberId, 0);
            }else if(m1>0 && m2>0) {
                List<String> m1IdList = this.tabHaobanExternalClerkRelatedMapper.getIdList(memberId, enterpriseId) ;
                List<String> m2IdList = this.tabHaobanExternalClerkRelatedMapper.getIdList(mergeMemberId, enterpriseId) ;