Merge branch 'master_bug_1028' into 'master'

忽略type=2的加好友

See merge request !359

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

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

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

@@ -1066,6 +1066,10 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
             log.info("【新增外部联系人】查询好友失败,externalUserid={}",externalUserid);
             return null;
         }
+        if(null != externalUserDTO.getFriendType() && 2==externalUserDTO.getFriendType()) {
+            log.info("【新增外部联系人】忽略-2表示该外部联系人是企业微信用户,externalUserid={}",externalUserid);
+            return null;
+        }
         dto.setWxEnterpriseId(wxEnterpriseId);
         dto.setExternalName(EmojiFilterUtil.removeAllEmoji(externalUserDTO.getName()));
         dto.setAddCreateTime(externalUserDTO.getAddCreateTime());