浏览代码

上架费到期服务通知

kaick 2 年之前
父节点
当前提交
d0361cb608

+ 2 - 5
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.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 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;
 import java.util.ArrayList;
 
 
@@ -34,7 +31,7 @@ public class MessageApi {
      */
      */
     @ApiOperation("综合消息工具")
     @ApiOperation("综合消息工具")
     @PostMapping("/message/send")
     @PostMapping("/message/send")
-    public ResponseJson sendCommonMessage(MessageModel messageModel) {
+    public ResponseJson sendCommonMessage(@RequestBody MessageModel messageModel) {
         messageSender.messageSend(messageModel);
         messageSender.messageSend(messageModel);
         return ResponseJson.success();
         return ResponseJson.success();
     }
     }

+ 4 - 0
src/main/java/com/caimei365/tools/model/dto/message/InsideMessage.java

@@ -41,6 +41,10 @@ public class InsideMessage implements Serializable {
      * 消息内容
      * 消息内容
      */
      */
     private String content;
     private String content;
+    /**
+     * 失败原因
+     */
+    private String reasonContent;
     /**
     /**
      * 操作完成时间
      * 操作完成时间
      */
      */

+ 8 - 4
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.mapper.OrderClubMapper;
 import com.caimei365.tools.model.dto.message.InsideMessage;
 import com.caimei365.tools.model.dto.message.InsideMessage;
 import com.caimei365.tools.model.dto.message.MessageModel;
 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.WechatTemplateMessage;
 import com.caimei365.tools.model.dto.message.enums.MessageType;
 import com.caimei365.tools.model.dto.message.enums.MessageType;
 import com.caimei365.tools.model.po.*;
 import com.caimei365.tools.model.po.*;
@@ -48,7 +49,8 @@ public class ShopMessTask {
     @Resource
     @Resource
     private MessageSender messageSender;
     private MessageSender messageSender;
 
 
-        @Scheduled(cron = "0 0 15 * * ?")
+    @Scheduled(cron = "0 0 15 * * ?")
+//    @Scheduled(cron = "1/180 * * * * ?")
     public void outTimePutAwayFee() {
     public void outTimePutAwayFee() {
         log.info("-------------------------------上架费过期推送开始-------------------------------");
         log.info("-------------------------------上架费过期推送开始-------------------------------");
         putAwayFee(0);
         putAwayFee(0);
@@ -57,7 +59,7 @@ public class ShopMessTask {
         log.info("-------------------------------上架费过期推送结束-------------------------------");
         log.info("-------------------------------上架费过期推送结束-------------------------------");
     }
     }
 
 
-//        @Scheduled(cron = "0 0/2 * * * ?")
+    //        @Scheduled(cron = "0 0/2 * * * ?")
     @Scheduled(cron = "0 0 11 * * ?")
     @Scheduled(cron = "0 0 11 * * ?")
     public void outTimeQualification() {
     public void outTimeQualification() {
         log.info("---------------------------开始检测商品资质证书是否过期-------------------------------");
         log.info("---------------------------开始检测商品资质证书是否过期-------------------------------");
@@ -124,8 +126,10 @@ public class ShopMessTask {
         shopIds.forEach(s -> {
         shopIds.forEach(s -> {
             //站内信
             //站内信
             MessageModel<InsideMessage> insideMessageMessageModel = new MessageModel<>();
             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);
             messageSender.messageSend(insideMessageMessageModel);
             //短信
             //短信
             String mobile = messageCenterMapper.contractMobiles(s.getShopId());
             String mobile = messageCenterMapper.contractMobiles(s.getShopId());

+ 4 - 4
src/main/resources/bootstrap.yml

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