Merge branch 'master_xgh_bug_11月' into 'developer'

会员合并

See merge request !370

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

@@ -393,9 +393,9 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
        }else if(type==1) {
            //合并会员,会员会先调删除,在调合并。顺序不能调换
            log.info("合并会员,memberId：{},新memberId={}", memberId , mergeMemberId);
-           tabHaobanExternalClerkRelatedMapper.updateMemberIdByMemberId(mergeMemberId, memberId, enterpriseId);
-           int i = tabHaobanExternalClerkRelatedMapper.countByMemberId(mergeMemberId, enterpriseId);
+           int i = tabHaobanExternalClerkRelatedMapper.countByMemberId(memberId, enterpriseId);
            if (i > 0) {
+               tabHaobanExternalClerkRelatedMapper.updateMemberIdByMemberId(mergeMemberId, memberId, enterpriseId);
                log.info("会员合并 ,更新为企微好友,新memberId:{}", mergeMemberId);
                this.memberApiService.updateMemberQywxFlag(enterpriseId, mergeMemberId, 1);
            }