Merge branch 'master' into developer

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

@@ -304,13 +304,15 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
     public void delByMemberIdAndEnterpriseId(String memberId, String enterpriseId, String mergeMemberId) {
         log.info("删除会员或者合并会员,memberId:{},enterpriseId:{},mergeMemberId:{}", memberId, enterpriseId, mergeMemberId);
         if (StringUtils.isBlank(mergeMemberId)) {
+            log.info("删除会员，memberId：{}",memberId);
             //删除会员
             tabHaobanExternalClerkRelatedMapper.updateStatusByMemberId(memberId, enterpriseId);
         } else {
-            int i = tabHaobanExternalClerkRelatedMapper.countByMemberId(memberId, enterpriseId);
+            //合并会员
+            log.info("合并会员，memberId：{}",memberId);
+            tabHaobanExternalClerkRelatedMapper.updateMemberIdByMemberId(mergeMemberId, memberId, enterpriseId);
+            int i = tabHaobanExternalClerkRelatedMapper.countByMemberId(mergeMemberId, enterpriseId);
             if (i > 0) {
-                //合并会员
-                tabHaobanExternalClerkRelatedMapper.updateMemberIdByMemberId(mergeMemberId, memberId, enterpriseId);
                 //回调给会员，更新是否为企微好友
                 log.info("会员合并，有企微好友，通知会员，合并会员后更新为企微好友,memberId:{},mergeMemberId:{}", memberId, mergeMemberId);
                 memberApiService.updateMemberQywxFlag(enterpriseId, mergeMemberId, 1);