Merge branch 'dev_wx_msg' into dev_temp

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpMessageExtServiceImpl.java

@@ -58,7 +58,9 @@ public class WxmpMessageExtServiceImpl implements WxmpMessageExtService {
                 wxmpMsgList.add(wxSubscribeMessageFormDTO);
             }
         }
-        wxmpMessageService.sendWxSubscribeMessage(wxmpMsgList);
+        if (wxmpMsgList.size() > 0){
+            wxmpMessageService.sendWxSubscribeMessage(wxmpMsgList);
+        }
         return userMessageService.saveUserMessageList(userMsgList);
     }
 

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpMessageServiceImpl.java

@@ -278,12 +278,12 @@ public class WxmpMessageServiceImpl implements WxmpMessageService {
                         decrease = wxmpWorkUserSubscribeDao.decreaseWorkSubscribeCount(openId, templateId, customerId, 1,userId);
                     }
                     if (decrease == 0) {
-                        logger.error("消息{}发送成功但订阅条数-1失败", JSON.toJSONString(msg));
+                        logger.warn("消息{}发送成功但订阅条数-1失败", JSON.toJSONString(msg));
                     }
                     //存表
                     int saveRes = wxmpMsgSendRecordService.saveRecord(initRecord(msg, templateId, openId, WxmpMessageConstant.SUCCESS));
                     if (saveRes == 0) {
-                        logger.error("消息{}发送成功但存入记录表失败", JSON.toJSONString(msg));
+                        logger.warn("消息{}发送成功但存入记录表失败", JSON.toJSONString(msg));
                     }
                 } else {
                     //发送失败
@@ -296,7 +296,7 @@ public class WxmpMessageServiceImpl implements WxmpMessageService {
                             clear = wxmpWorkUserSubscribeDao.clearWorkSubscribeCount(openId, templateId, customerId,userId);
                         }
                         if (clear == 0) {
-                            logger.error("消息{}发送失败且清空订阅条数失败", JSON.toJSONString(msg));
+                            logger.warn("消息{}发送失败且清空订阅条数失败", JSON.toJSONString(msg));
                         }
                     }
 
@@ -316,11 +316,11 @@ public class WxmpMessageServiceImpl implements WxmpMessageService {
                     wxmpMsgSendRecordEntity.setReason(errMsg);
                     int saveRes = wxmpMsgSendRecordService.saveRecord(wxmpMsgSendRecordEntity);
                     if (saveRes == 0) {
-                        logger.error("消息{}发送失败且存入记录表失败", JSON.toJSONString(msg));
+                        logger.warn("消息{}发送失败且存入记录表失败", JSON.toJSONString(msg));
                     }
                 }
 
-                logger.error("消息:{}发送失败,原因是:{}", JSON.toJSONString(msg), errMsg);
+                logger.warn("消息:{}发送失败,原因是:{}", JSON.toJSONString(msg), errMsg);
                 continue;
             }
         }