Merge branch 'master_xgh_bug_11月' into 'master_xgh_我的客户迭代'

Master xgh bug 11月

See merge request !368

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

@@ -298,8 +298,7 @@ public interface ExternalClerkRelatedApiService {
      */
     void initWxEnterpriseFriend(String wxEnterpriseId);
 
-
-
     int getCountExternalClerk(String wxEnterpriseId, String staffId, List<Integer> statusFlags);
-
+    
+    int updateExternalStatus(String wxEnterpriseId , String externalUserid,int status) ;
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabHaobanExternalClerkRelatedMapper.java

@@ -383,4 +383,6 @@ public interface TabHaobanExternalClerkRelatedMapper {
     
     void updateClerkInfo(@Param("staffId")String staffId, @Param("oldClerkId")String oldClerkId, @Param("newClerkId")String newClerkId, @Param("storeId")String storeId);
 
+    int updateExternalStatus(@Param("wxEnterpriseId")String wxEnterpriseId, @Param("externalUserid")String externalUserid, @Param("status")int status);
+
 }
\ No newline at end of file

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

@@ -391,11 +391,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);
            }
@@ -725,4 +725,9 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
     public int getCountExternalClerk(String wxEnterpriseId, String staffId, List<Integer> statusFlags) {
         return tabHaobanExternalClerkRelatedMapper.getCountExternalClerk(wxEnterpriseId,staffId,statusFlags);
     }
+    
+    @Override
+    public int updateExternalStatus(String wxEnterpriseId, String externalUserid,int status) {
+        return this.tabHaobanExternalClerkRelatedMapper.updateExternalStatus(wxEnterpriseId,externalUserid,status);
+    }
 }

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());

haoban-manage3-service/src/main/resources/mapper/TabHaobanExternalClerkRelatedMapper.xml

@@ -750,5 +750,10 @@
           and clerk_id = #{oldClerkId}
           and status_flag in (1,3,4) 
 	</update>
+	
+	<update id="updateExternalStatus">
+		update tab_haoban_external_clerk_related set external_status = #{status} where 
+		external_user_id = #{externalUserid} and wx_enterprise_id = #{wxEnterpriseId}
+	</update>
 
 </mapper>
\ No newline at end of file