Merge branch 'master-xgh-好办停用' into 'developer'

Master xgh 好办停用

See merge request !222

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

@@ -140,7 +140,7 @@ public class WxEnterpriseServiceImpl implements WxEnterpriseService {
     @Override
     public void stopHaoban(String enterpriseId) {
         List<TabHaobanWxEnterpriseRelated> list =  this.wxEnterpriseRelatedMapper.listByEnterpriseId(enterpriseId) ;
-        logger.info("停用好办={},list={}",enterpriseId,JSON.toJSONString(list));
+        logger.info("停用好办={},商户list={}",enterpriseId,JSON.toJSONString(list));
         if(CollectionUtils.isEmpty(list)){
             return ;
         }
@@ -151,7 +151,7 @@ public class WxEnterpriseServiceImpl implements WxEnterpriseService {
         }
         this.wxEnterpriseRelatedMapper.deleteByEnterpriseId(enterpriseId) ;
         Map<String,Object> enMap = new HashMap<>();
-        enMap.put("enterpriseId", enterpriseId) ;
+        enMap.put("enterpriseId", enterpriseId + list.get(0).getEnterpriseName()) ;
         alert("删除商户企微关联告警", enMap);
         for(String wxEnterpriseId : wxEnterpriseIdList) {
           List<TabHaobanWxEnterpriseRelated> relationList =  this.wxEnterpriseRelatedMapper.listByWxenterpriseId(wxEnterpriseId) ;
@@ -234,6 +234,6 @@ public class WxEnterpriseServiceImpl implements WxEnterpriseService {
     private void alert(String title, Map<String, Object> map) {
         String msg = title + JSON.toJSONString(map);
         String dingUrl = "https://oapi.dingtalk.com/robot/send?access_token=c38fdc53d26e9a019640755bdada1ce07ebd44a2555d1c8acc299de7a7b5b857";
-        DingUtils.send(msg, dingUrl, true);
+        DingUtils.send(msg, dingUrl, false);
     }
 }

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

@@ -29,9 +29,9 @@ public class HaobanCommonMQApiServiceImpl implements HaobanCommonMQApiService {
     @Override
     public void putCommonMessage(CommonMQDTO dto) {
         String message = JSONObject.toJSONString(dto);
-        log.info("接收信息={}",message);
+        log.info("加入好办通用队列params={}",message);
         try {
-            mqClient.sendCommonMessage("marketingCommonRouter", message,
+            mqClient.sendCommonMessage("haobanCommonRouter", message,
                     "com.gic.haoban.manage.api.service.HaobanCommonMQApiService", "commonHandler");
         } catch (Exception e) {
             log.error("发送MQ异常");
@@ -41,6 +41,7 @@ public class HaobanCommonMQApiServiceImpl implements HaobanCommonMQApiService {
 
     @Override
     public void commonHandler(String message) {
+        log.info("接收好办通用队列params={}",message);
         CommonMQDTO dto = JSON.parseObject(message, CommonMQDTO.class);
         // 好办停用,删除定时
         if(dto.getType()==1) {