feat:增加好友关系逻辑修改，全部走不同开平

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

@@ -115,17 +115,25 @@ public interface MemberUnionidRelatedApiService {
 
 	List<MemberUnionidRelatedDTO> getByWxUserIdListAndWxEnterpriseId(List<String> userIdList, String wxEnterpriseId);
 
+	/**
+	 * 添加好友（旧逻辑）
+	 *
+	 * @param dto dto
+	 * @return {@link String }
+	 * @author mozhu
+	 * @date 2021-12-13 17:12:39
+	 */
 	String addMemberUnionidRelatedNew(MemberUnionidRelatedDTO dto);
 
 	void mqFreshWxFrend(String res);
 
-	void cleanNoExsitFriend(String wxEnterpriseId,String wxUserId,String resWes);
+	void cleanNoExsitFriend(String wxEnterpriseId, String wxUserId, String resWes);
 
-	List<String> listSelfExterialList(String wxEnterpriseId,String wxUserId);
+	List<String> listSelfExterialList(String wxEnterpriseId, String wxUserId);
 
 	List<String> listExterialList(String wxEnterpriseId, String wxUserId);
 
-	ExternalUserDTO getCorpSelfExternalUseridInfo(String wxEnterpriseId,String wxUserId, String externalUserId);
+	ExternalUserDTO getCorpSelfExternalUseridInfo(String wxEnterpriseId, String wxUserId, String externalUserId);
 
 	String addExternal(ExternalUserDTO dto);
 

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

@@ -350,6 +350,10 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
             List<String> externalUserIdList = enterprisePageInfoList.stream().map(TabHaobanExternalClerkRelated::getExternalUserId).collect(Collectors.toList());
             //更新新的external_user_id
             List<QywxNewExternalUseridDTO> newExternalUserid = qywxUserApiService.getNewExternalUserid(corpid, config.getWxSuiteid(), Arrays.toString(externalUserIdList.toArray()));
+            if (CollectionUtils.isEmpty(newExternalUserid)) {
+                log.info("更新新的外部联系人id，查询企业微信接口报错");
+                break;
+            }
             for (QywxNewExternalUseridDTO qywxNewExternalUseridDTO : newExternalUserid) {
                 tabHaobanExternalClerkRelatedMapper.updateExternalUserIdByOldExternalUserId(qywxNewExternalUseridDTO.getNewExternalUserid(), qywxNewExternalUseridDTO.getExternalUserid(), wxEnterpriseId);
             }

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

@@ -344,7 +344,6 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
             exsitDTO.setClerkId(staffClerkRelationDTO.getClerkId());
             externalClerkRelatedService.update(exsitDTO);
         }
-
     }
 
     /**
@@ -359,10 +358,8 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         String name = dto.getExternalName();
         String createTime = dto.getAddCreateTime();
         String externalUserId = dto.getExternalUserid();
-        String avatar = dto.getAvatar();
-        String unionId = dto.getUnionid();
+
         if (StringUtils.isAnyBlank(wxUserId, wxEnterpriseId, name, createTime, externalUserId)) {
-            log.info("【新增外部联系人】wxUserId={},wxEnterpriseId={},name={},createTime={},avatar={},unionId={},externalUserId={}", wxUserId, wxEnterpriseId, name, createTime, avatar, unionId, externalUserId);
             checkQywxSettingApiService.saveFriendCallback(wxEnterpriseId, null, dto);
             return;
         }
@@ -388,6 +385,27 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
             log.info("没有存在企业关联：{},{}", staffClerkRelationDTO.getWxEnterpriseId(), staffClerkRelationDTO.getEnterpriseId());
             return;
         }
+        //发送欢迎语
+        addFriendByWelcome(dto, staffClerkRelationDTO);
+        //addExternalClerkRelated(dto, staffId, staffClerkRelationDTO, wxEnterpriseRelated);
+    }
+
+    /**
+     * 根据统一开平和不同开平 处理不同的添加好友关系（新逻辑已废弃）
+     *
+     * @param dto
+     * @param staffId
+     * @param staffClerkRelationDTO
+     * @param wxEnterpriseRelated
+     */
+    @Deprecated
+    private void addExternalClerkRelated(MemberUnionidRelatedDTO dto, String staffId, StaffClerkRelationDTO staffClerkRelationDTO, TabHaobanWxEnterpriseRelated wxEnterpriseRelated) {
+        String wxUserId = dto.getWxUserId();
+        String wxEnterpriseId = dto.getWxEnterpriseId();
+        String name = dto.getExternalName();
+        String createTime = dto.getAddCreateTime();
+        String externalUserId = dto.getExternalUserid();
+        String avatar = dto.getAvatar();
         //好友不开卡 发送欢迎语
         if (wxEnterpriseRelated.getMemberOpenCardFlag() == 1) {
             log.info("不同开平，欢迎页面：");
@@ -395,6 +413,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
             return;
         } else {
             log.info("同一开平，创建关联关系...");
+            String unionId = dto.getUnionid();
             if (unionId == null) {
                 log.info("unionid 不存在");
                 return;
@@ -462,9 +481,15 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
             //同步好友标签
             pushTagSync(member.getMemberId(), wxEnterpriseId, staffClerkRelationDTO.getEnterpriseId());
         }
-
     }
 
+    /**
+     * 发送欢迎语
+     *
+     * @param dto
+     * @param staffClerkRelationDTO
+     * @param sendApp
+     */
     private void sendWelcome(MemberUnionidRelatedDTO dto, StaffClerkRelationDTO staffClerkRelationDTO, boolean sendApp) {
         log.info("发送欢迎语：{}", JSONObject.toJSONString(staffClerkRelationDTO));
         String relationKey = SecureUtil.md5(staffClerkRelationDTO.getClerkId() + dto.getExternalUserid());
@@ -579,7 +604,6 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
             dto.setUnionid(fullDTO.getUnionid());
         }
         return uuid;
-
     }
 
     @Deprecated
@@ -1358,7 +1382,6 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
             log.info("企业不存在");
             return null;
         }
-        //String uJ = qywxUserApiService.getExternalUseridInfo(wxEnterprise.getCorpid(), "ww2c34dc56739bb105", externalUserId);
         String uJ = qywxUserApiService.getExternalUseridInfo(wxEnterprise.getCorpid(), config.getWxSuiteid(), externalUserId);
         if (StringUtils.isBlank(uJ)) {
             log.info("好友不存在");
@@ -1370,6 +1393,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         String name = "";
         String createTime = "";
         String avatar = "";
+        String unionid = "";
         Integer friendType = 1;
         if (StringUtils.isNotBlank(uJ)) {
             JSONObject jo = JSON.parseObject(uJ);
@@ -1573,7 +1597,6 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
             exsitDTO.setAddCreateTime(createTime);
             exsitDTO.setSelfExternalUserid(dto.getSelfExternalUserId());
             exsitDTO.setExternalName(name);
-
             memberUnionRelatedService.update(exsitDTO);
         }