Merge remote-tracking branch 'origin/developer' into developerD

src/main/java/com/caimei365/tools/controller/MessageApi.java

@@ -7,10 +7,7 @@ import com.caimei365.tools.service.MessageSender;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
 
@@ -34,7 +31,7 @@ public class MessageApi {
      */
     @ApiOperation("综合消息工具")
     @PostMapping("/message/send")
-    public ResponseJson sendCommonMessage(MessageModel messageModel) {
+    public ResponseJson sendCommonMessage(@RequestBody MessageModel messageModel) {
         messageSender.messageSend(messageModel);
         return ResponseJson.success();
     }

src/main/java/com/caimei365/tools/model/dto/message/InsideMessage.java

@@ -41,6 +41,11 @@ public class InsideMessage implements Serializable {
      * 消息内容
      */
     private String content;
+
+    /**
+     * 失败原因
+     */
+    private String reasonContent;
     /**
      * 操作完成时间
      */
@@ -110,6 +115,13 @@ public class InsideMessage implements Serializable {
     /**
      * 供应商公司名称
      */
+    public String getReasonContent() {
+        return reasonContent;
+    }
+
+    public void setReasonContent(String reasonContent) {
+        this.reasonContent = reasonContent;
+    }
     private String shopName;
 
     public Integer getId() {

src/main/java/com/caimei365/tools/service/impl/MessageSenderImpl.java

@@ -51,8 +51,7 @@ public class MessageSenderImpl implements MessageSender {
     }
 
     public void sendSMS(MessageModel model) {
-        String info = JSONObject.toJSONString(model.info());
-        SmsMessage smsMessage = JSONObject.parseObject(info, SmsMessage.class);
+        String info = JSONObject.toJSONString(model.info());        SmsMessage smsMessage = JSONObject.parseObject(info, SmsMessage.class);
         if (null != model.mqInfo() && StringUtils.isNotBlank(model.mqInfo().topic())) {
             mqService.sendCommonMessage(setMessageDto(model));
         } else {

src/main/java/com/caimei365/tools/task/ShopMessTask.java

@@ -5,6 +5,7 @@ import com.caimei365.tools.mapper.MessageCenterMapper;
 import com.caimei365.tools.mapper.OrderClubMapper;
 import com.caimei365.tools.model.dto.message.InsideMessage;
 import com.caimei365.tools.model.dto.message.MessageModel;
+import com.caimei365.tools.model.dto.message.MqInfo;
 import com.caimei365.tools.model.dto.message.WechatTemplateMessage;
 import com.caimei365.tools.model.dto.message.enums.MessageType;
 import com.caimei365.tools.model.po.*;
@@ -48,7 +49,8 @@ public class ShopMessTask {
     @Resource
     private MessageSender messageSender;
 
-        @Scheduled(cron = "0 0 15 * * ?")
+    @Scheduled(cron = "0 0 15 * * ?")
+//    @Scheduled(cron = "1/180 * * * * ?")
     public void outTimePutAwayFee() {
         log.info("-------------------------------上架费过期推送开始-------------------------------");
         putAwayFee(0);
@@ -57,7 +59,7 @@ public class ShopMessTask {
         log.info("-------------------------------上架费过期推送结束-------------------------------");
     }
 
-//        @Scheduled(cron = "0 0/2 * * * ?")
+    //        @Scheduled(cron = "0 0/2 * * * ?")
     @Scheduled(cron = "0 0 11 * * ?")
     public void outTimeQualification() {
         log.info("---------------------------开始检测商品资质证书是否过期-------------------------------");
@@ -124,8 +126,10 @@ public class ShopMessTask {
         shopIds.forEach(s -> {
             //站内信
             MessageModel<InsideMessage> insideMessageMessageModel = new MessageModel<>();
-            insideMessageMessageModel.code(MessageType.WEB_INSIDE_MESSAGE).info(new InsideMessage().shopId(s.getShopId()).userType(2)
-                    .messageType(3).shopTieredType(1).content("今日后到期"));
+            insideMessageMessageModel.code(MessageType.WEB_INSIDE_MESSAGE)
+                    .mqInfo(new MqInfo().topic("MessageLine").delay(3).async(0))
+                    .info(new InsideMessage().shopId(s.getShopId()).userType(2)
+                            .messageType(3).shopTieredType(1).content(contentDay + "日后到期"));
             messageSender.messageSend(insideMessageMessageModel);
             //短信
             String mobile = messageCenterMapper.contractMobiles(s.getShopId());

src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 server:
   port: 18013
 
-# 指定当前服务的名称，这个名称会注册到注册中心
+            # 配置文件名称# 指定当前服务的名称，这个名称会注册到注册中心
 spring:
   application:
     name: @artifactId@
@@ -9,10 +9,10 @@ spring:
     config:                             # Config客户端配置
       profile: @activatedProperties@    # 启用配置后缀名称
       label: master                     # 分支名称
-      # uri: http://localhost:18001      # 配置中心地址（本地）
-      # uri: http://47.119.112.46:18001  # 配置中心地址（测试环境）
+#      uri: http://localhost:18001      # 配置中心地址（本地）
+#      uri: http://47.119.112.46:18001  # 配置中心地址（测试环境）
       uri: http://120.79.162.1:18001     # 配置中心地址（正式环境）
-      name: tools                        # 配置文件名称
+      name: tools
   #上传文件大小
   servlet:
     multipart:

src/main/resources/mapper/MessageCenter.xml

@@ -3,17 +3,17 @@
 <mapper namespace="com.caimei365.tools.mapper.MessageCenterMapper">
     <insert id="addMessageCenter">
         INSERT INTO message_center (shopID, clubID, userType, messageType, content, time, accountType, couponType, orderID, orderMessageType,
-                                    couponFee, couponMessageType, ShopMessType, ShopTieredType)
+                                    couponFee, couponMessageType, ShopMessType, ShopTieredType, reasonContent)
         VALUES (#{shopId}, #{clubId}, #{userType}, #{messageType}, #{content}, now(), #{accountType}, #{couponType},#{orderID},#{orderMessageType},
-                #{couponFee}, #{couponMessageType}, #{shopMessType}, #{shopTieredType})
+                #{couponFee}, #{couponMessageType}, #{shopMessType}, #{shopTieredType}, #{reasonContent})
     </insert>
     <insert id="sendInsideMessage">
         INSERT INTO message_center (shopID, clubID, orderID, userType, messageType, accountType, orderMessageType,
                                     couponMessageType, couponFee, content, time, saved, shopMessType,
-                                    shopTieredType, couponType, productID)
+                                    shopTieredType, couponType, productID,reasonContent)
         VALUES (#{shopId}, #{clubId}, #{orderId}, #{userType}, #{messageType}, #{accountType}, #{orderMessageType},
                 #{couponMessageType}, #{couponFee}, #{content}, now(), 0, #{shopMessType},
-                #{shopTieredType}, #{couponType}, #{productId})
+                #{shopTieredType}, #{couponType}, #{productId}, #{reasonContent})
     </insert>
     <insert id="addNotification">
         INSERT INTO notification(theme, newTime, shopContent, porductID, shopID)