Merge branch 'master_欢迎语调整' into 'master'

Master 欢迎语调整

See merge request !1132

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

@@ -102,7 +102,7 @@ public class WelcomeSendServiceImpl implements WelcomeSendService {
 
     @Override
     public void sendWelcome(String params) {
-        log.info("发送欢迎语={}", params);
+        log.info("新发送欢迎语={}", params);
         QwFrientNoticeDTO dto = JSON.parseObject(params, QwFrientNoticeDTO.class);
         this.sendWelcome(dto.getCorpid(), dto.getExternalUserid(), dto.getWelcomeCode(), dto.getWxUserId(),
                 dto.getState());
@@ -151,7 +151,7 @@ public class WelcomeSendServiceImpl implements WelcomeSendService {
             welcomeBO = welcomeService.getMatchWelcome(staffId, wxEnterpriseId);
         }
         if (Objects.isNull(welcomeBO)) {
-            log.info("欢迎语未配置wxEnterpriseId:{}", wxEnterpriseId);
+            log.info("活码欢迎语未配置wxEnterpriseId:{}", wxEnterpriseId);
             return;
         }
         // 内容

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

@@ -362,13 +362,8 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         if(this.mqCheck(dto)) {
             mqName = "dealQywxExternalUserMq2";
         }
-        Object t = RedisUtil.getCache("dealQywxExternalUserMqWelcome-test");
-        int delay = 0 ;
-        if(null != t) {
-            delay = (int) t ;
-        }
         try {
-            instance.sendMessage(mqName, JSONObject.toJSONString(dealQywxExternalUserPojo),delay);
+            instance.sendMessage(mqName, JSONObject.toJSONString(dealQywxExternalUserPojo));
         } catch (Exception e) {
             log.info("异步处理异常：{}", e);
         }