Merge branch 'fixbug_2022_0301' into developer

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

@@ -292,6 +292,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         String name = dto.getExternalName();
         String createTime = dto.getAddCreateTime();
         String externalUserId = dto.getExternalUserid();
+        String unionid = dto.getUnionid();
         log.info("新增外部联系人,wxEnterpriseId:{}", wxEnterpriseId);
         if (StringUtils.isAnyBlank(wxUserId, wxEnterpriseId, name, createTime, externalUserId)) {
             checkQywxSettingApiService.saveFriendCallback(wxEnterpriseId, null, dto);
@@ -330,21 +331,11 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
             log.info("未查询到企业：wxEnterpriseId:{}", wxEnterpriseId);
             return;
         }
-
-        String corpid = wxEnterpriseDTO.getCorpid();
-        if (corpid.length() < 20) {
-            Integer agreeExternalUseridFlag = wxEnterpriseDTO.getAgreeExternalUseridFlag();
-            log.info("加好友判断新旧的逻辑，corpid：{},agreeExternalUseridFlag：{}", corpid, agreeExternalUseridFlag);
-            if (agreeExternalUseridFlag != null && agreeExternalUseridFlag == 1) {
-                log.info("同意直接走，发送欢迎语逻辑：wxEnterpriseId:{}", wxEnterpriseId);
-                addFriendByWelcome(dto, staffClerkRelationDTO);
-            } else {
-                log.info("未同意直接走原来同一开平逻辑：wxEnterpriseId:{}", wxEnterpriseId);
-                addExternalClerkRelated(dto, staffId, staffClerkRelationDTO, wxEnterpriseRelated);
-            }
+        if (StringUtils.isNotBlank(unionid)) {
+            log.info("同一开平逻辑：wxEnterpriseId:{}", wxEnterpriseId);
+            addExternalClerkRelated(dto, staffId, staffClerkRelationDTO, wxEnterpriseRelated);
         } else {
-            //发送欢迎语
-            log.info("加好友wp开头的，走欢迎语：{}", corpid);
+            log.info("发送欢迎语逻辑：wxEnterpriseId:{}", wxEnterpriseId);
             addFriendByWelcome(dto, staffClerkRelationDTO);
         }
     }
@@ -440,7 +431,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
             exsitDTO.setStatusFlag(1);
             externalClerkRelatedService.update(exsitDTO);
         }
-        sendWelcome(dto, wxEnterpriseId, enterpriseId, staffId, clerkId, false);
+        sendWelcome(dto, wxEnterpriseId, enterpriseId, staffId, clerkId);
         //同步好友标签
         pushTagSync(memberId, wxEnterpriseId, enterpriseId);
         //回调给会员，更新是否为企微好友
@@ -461,7 +452,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         String wxEnterpriseId = staffClerkRelationDTO.getWxEnterpriseId();
         String enterpriseId = staffClerkRelationDTO.getEnterpriseId();
         //发送欢迎语
-        sendWelcome(dto, wxEnterpriseId, enterpriseId, staffId, clerkId, true);
+        sendWelcome(dto, wxEnterpriseId, enterpriseId, staffId, clerkId);
 
         //保存好友关系
         List<TabHaobanExternalClerkRelated> externalClerkRelateds = externalClerkRelatedService.listByExTernalUseridAndWxUserIdAllStatus(wxEnterpriseId, dto.getExternalUserid(), dto.getWxUserId());
@@ -505,10 +496,9 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
      * @param wxEnterpriseId
      * @param enterpriseId
      * @param staffId
-     * @param sendApp
      */
-    private void sendWelcome(MemberUnionidRelatedDTO dto, String wxEnterpriseId, String enterpriseId, String staffId, String clerkId, boolean sendApp) {
-        log.info("发送欢迎语：dto:{},wxEnterpriseId:{},staffId:{},sendApp:{}", JSONObject.toJSONString(dto), wxEnterpriseId, staffId, sendApp);
+    private void sendWelcome(MemberUnionidRelatedDTO dto, String wxEnterpriseId, String enterpriseId, String staffId, String clerkId) {
+        log.info("发送欢迎语：dto:{},wxEnterpriseId:{},staffId:{}", JSONObject.toJSONString(dto), wxEnterpriseId, staffId);
         String relationKey = SecureUtil.md5(staffId + dto.getExternalUserid());
         FriendSettingDetailBO friendSetting = welcomeService.getFriendSetting(wxEnterpriseId);
         if (friendSetting == null) {
@@ -556,21 +546,19 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
                 }
             }
         } else if (friendSettingType.equals(FriendSettingTypeEnum.TEXT_AND_MINI_PROGRAM.getCode())) {
-            log.info("发送小程序：wxEnterpriseId:{},sendApp:{}", wxEnterpriseId, sendApp);
+            log.info("发送小程序：wxEnterpriseId:{}", wxEnterpriseId);
             //发送小程序
-            if (sendApp) {
-                TabMiniprogramSetting miniprogramSetting = miniprogramSettingService.getMiniprogramSetting(wxEnterpriseId, enterpriseId);
-                if (null == miniprogramSetting) {
-                    log.info("需要配置小程序配置：wxEnterpriseId:{},enterpriseId:{}", wxEnterpriseId, enterpriseId);
-                    return;
-                }
-                QywxMiniprogramExternalBaseDTO messageBaseDTO = new QywxMiniprogramExternalBaseDTO();
-                messageBaseDTO.setAppid(miniprogramSetting.getAppId());
-                messageBaseDTO.setPicMediaId(miniprogramSetting.getMediaId());
-                messageBaseDTO.setTitle(miniprogramSetting.getTitle());
-                messageBaseDTO.setPage(config.getMemberOpenPage() + relationKey);
-                attachments.add(messageBaseDTO);
+            TabMiniprogramSetting miniprogramSetting = miniprogramSettingService.getMiniprogramSetting(wxEnterpriseId, enterpriseId);
+            if (null == miniprogramSetting) {
+                log.info("需要配置小程序配置：wxEnterpriseId:{},enterpriseId:{}", wxEnterpriseId, enterpriseId);
+                return;
             }
+            QywxMiniprogramExternalBaseDTO messageBaseDTO = new QywxMiniprogramExternalBaseDTO();
+            messageBaseDTO.setAppid(miniprogramSetting.getAppId());
+            messageBaseDTO.setPicMediaId(miniprogramSetting.getMediaId());
+            messageBaseDTO.setTitle(miniprogramSetting.getTitle());
+            messageBaseDTO.setPage(config.getMemberOpenPage() + relationKey);
+            attachments.add(messageBaseDTO);
         }
 
         List<WelcomeMediaBO> welcomeMediaList = welcomeDetailBO.getWelcomeMediaList();