Merge branch 'developer' of http://git.gicdev.com/haoban3.0/haoban-manage3.0.git into developer

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

@@ -138,10 +138,9 @@ public interface StaffClerkRelationApiService {
 
 
     /**
-     * 获取config
+     * 获取config（联系我）
      *
      * @param clerkId
-     * @param memberId
      * @return
      */
     ServiceResponse<String> getClerkMemberChatConfig(String clerkId);

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

@@ -522,7 +522,10 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
             }
             return;
         }
+
         String relationKey = SecureUtil.md5(staffId + dto.getExternalUserid());
+        // TODO: 2022/7/4  正常欢迎语还是活码
+
         WelcomeDetailBO welcomeDetailBO = welcomeService.getMatchWelcome(staffId, wxEnterpriseId);
         if (Objects.isNull(welcomeDetailBO)) {
             log.info("欢迎语未配置：wxEnterpriseId:{}", wxEnterpriseId);

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

@@ -421,7 +421,7 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
             return response;
         }
         WxEnterpriseDTO enterpriseDTO = wxEnterpriseService.selectById(relationDTO.getWxEnterpriseId());
-        String configId = qywxUserApiService.getExternalcontactByUserId(enterpriseDTO.getCorpid(), secretSetting.getSecretVal(), send);
+        String configId = qywxUserApiService.getSelfExternalcontactByUserId(enterpriseDTO.getCorpid(), secretSetting.getSecretVal(), send);
         logger.info("configId:{}", configId);
         if (StringUtils.isBlank(configId)) {
             logger.info("staff:{}", configId, JSONObject.toJSONString(relationDTO));