bugfix

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

@@ -89,7 +89,7 @@ public class ShopMessTask {
 ////        System.out.println(s);
 //    }
 
-        @Scheduled(cron = "0 0 15 * * ?")
+    @Scheduled(cron = "0 0 15 * * ?")
 //    @Scheduled(cron = "0 0/15 * * * ?")
     public void Timesjf() {
         log.info("上架费过期推送开始");
@@ -203,11 +203,9 @@ public class ShopMessTask {
                     firsts = "尊敬的采美供应商用户，您的账号维护费用30天后即将到期！";
                 }
                 try {
-
                     Integer userId = messageCenterMapper.userIds(shopID);
                     String accessToken = weChatService.getAccessToken();
                     String openid = messageCenterMapper.getOpenidListByPermission(messageCenterMapper.FromUnionId(userId));
-                    String date = s.toString();
                     // 跳转到【小程序付款-选择支付方式页面】
                     String pagePath = "https://www.caimei365.com/";
                     // sendTemplateMsg(openid, 标题, 金额, 收款日期, 备注, 跳转链接
@@ -221,7 +219,7 @@ public class ShopMessTask {
     }
 
 
-        @Scheduled(cron = "0 0 10 15 * ?")
+    @Scheduled(cron = "0 0 10 15 * ?")
 //@Scheduled(cron = "0 0/10 * * * ?")
     public void gwc() {
         log.info("------------开始推送购物车相关短信------------------------>");
@@ -546,7 +544,7 @@ public class ShopMessTask {
         });
     }
 
-//    @Scheduled(cron = "0 0/2 * * * ?")
+    //    @Scheduled(cron = "0 0/2 * * * ?")
     @Scheduled(cron = "0 0 15 * * ?")
     private void Timeth() {
         log.info(">>>>>三天后下架");
@@ -609,92 +607,92 @@ public class ShopMessTask {
         SimpleDateFormat dateR = new SimpleDateFormat("yyyy-MM-dd");
         String current = dateFormat.format(new Date());
         //订单超时未确认的时间
-        Integer hour= orderClubMapper.cmorderconfig("confirmOverTime");
+        Integer hour = orderClubMapper.cmorderconfig("confirmOverTime");
         //待收款 待发货超时
-        Integer hours=orderClubMapper.cmorderconfig("receivableOverTime");
+        Integer hours = orderClubMapper.cmorderconfig("receivableOverTime");
         //待收款 待发货超时
-        Integer hourmex=orderClubMapper.cmorderconfig("autoReceiptGoodsTime");
+        Integer hourmex = orderClubMapper.cmorderconfig("autoReceiptGoodsTime");
         //前日期
         Calendar calendar = Calendar.getInstance();
-       String day= dateF.format(new Date());
+        String day = dateF.format(new Date());
         Date receipttime = dateF.parse(day);
         calendar.setTime(receipttime);
         calendar.add(Calendar.HOUR, -hour);
-        String hTime=dateF.format(calendar.getTime());
-       List<OrderVo>orderStatuslist= orderClubMapper.oredrStatus();
+        String hTime = dateF.format(calendar.getTime());
+        List<OrderVo> orderStatuslist = orderClubMapper.oredrStatus();
         log.info(">>>>订单因超时未付款站内推送");
-       orderStatuslist.forEach(order -> {
-           Date i=new Date();
-           try {
-              i=dateF.parse(order.getOrderTime());
-           } catch (ParseException e) {
-               e.printStackTrace();
-           }
-           Integer num=hTime.compareTo(dateF.format(i));
-           if(num==0){
-        MessageCenterPo messageCenter = new MessageCenterPo();
-        //推送信息中心-交易物流-待确认超时
-            messageCenter.setShopId(null);
-            messageCenter.setClubId(order.getClubId());
-            messageCenter.setUserType(1);
-            messageCenter.setMessageType(1);
-            messageCenter.setOrderId(order.getOrderId());
-            messageCenter.setOrderMessageType(4);
-            messageCenter.setContent("您的订单因超时未付款，系统已自动取消订单！");
-            messageCenter.setTime(current);
-            messageCenterMapper.addMessageCenter(messageCenter);
-           }
-    });
-
-       //待收款 待发货超时
+        orderStatuslist.forEach(order -> {
+            Date i = new Date();
+            try {
+                i = dateF.parse(order.getOrderTime());
+            } catch (ParseException e) {
+                e.printStackTrace();
+            }
+            Integer num = hTime.compareTo(dateF.format(i));
+            if (num == 0) {
+                MessageCenterPo messageCenter = new MessageCenterPo();
+                //推送信息中心-交易物流-待确认超时
+                messageCenter.setShopId(null);
+                messageCenter.setClubId(order.getClubId());
+                messageCenter.setUserType(1);
+                messageCenter.setMessageType(1);
+                messageCenter.setOrderId(order.getOrderId());
+                messageCenter.setOrderMessageType(4);
+                messageCenter.setContent("您的订单因超时未付款，系统已自动取消订单！");
+                messageCenter.setTime(current);
+                messageCenterMapper.addMessageCenter(messageCenter);
+            }
+        });
+
+        //待收款 待发货超时
         Calendar calendars = Calendar.getInstance();
-        String days= dateF.format(new Date());
+        String days = dateF.format(new Date());
         Date receiptime = dateF.parse(days);
         calendars.setTime(receiptime);
         calendars.add(Calendar.HOUR, -hours);
-        String hTimes=dateF.format(calendars.getTime());
-        List<OrderVo> cmorderConfigStatus =orderClubMapper.cmorderConfigStatus();
+        String hTimes = dateF.format(calendars.getTime());
+        List<OrderVo> cmorderConfigStatus = orderClubMapper.cmorderConfigStatus();
         log.info(">>>>待收款 待发货超时站内推送!");
         cmorderConfigStatus.forEach(order -> {
-            Date i=new Date();
+            Date i = new Date();
             try {
-                i=dateF.parse(order.getOrderTime());
+                i = dateF.parse(order.getOrderTime());
             } catch (ParseException e) {
                 e.printStackTrace();
             }
-            Integer num=hTimes.compareTo(dateF.format(i));
-            if(num==0){
-            MessageCenterPo messageCenter = new MessageCenterPo();
-            //推送信息中心-账户通知
-            messageCenter.setShopId(null);
-            messageCenter.setClubId(order.getClubId());
-            messageCenter.setUserType(1);
-            messageCenter.setMessageType(1);
-            messageCenter.setOrderId(order.getOrderId());
-            messageCenter.setOrderMessageType(6);
-            messageCenter.setContent(null);
-            messageCenter.setTime(current);
-            messageCenterMapper.addMessageCenter(messageCenter);
+            Integer num = hTimes.compareTo(dateF.format(i));
+            if (num == 0) {
+                MessageCenterPo messageCenter = new MessageCenterPo();
+                //推送信息中心-账户通知
+                messageCenter.setShopId(null);
+                messageCenter.setClubId(order.getClubId());
+                messageCenter.setUserType(1);
+                messageCenter.setMessageType(1);
+                messageCenter.setOrderId(order.getOrderId());
+                messageCenter.setOrderMessageType(6);
+                messageCenter.setContent(null);
+                messageCenter.setTime(current);
+                messageCenterMapper.addMessageCenter(messageCenter);
             }
         });
 
         Calendar calendarmax = Calendar.getInstance();
-        String daymax= dateR.format(new Date());
+        String daymax = dateR.format(new Date());
         Date receiptimemax = dateR.parse(daymax);
         calendarmax.setTime(receiptimemax);
         calendarmax.add(Calendar.DATE, -hourmex);
-        String hTimemax=dateR.format(calendarmax.getTime());
-        List<OrderVo> cmorderStatus =orderClubMapper.cmorderConfigStatus();
+        String hTimemax = dateR.format(calendarmax.getTime());
+        List<OrderVo> cmorderStatus = orderClubMapper.cmorderConfigStatus();
         log.info(">>>>订单因超时已被系统自动确认收货站内推送!");
         cmorderStatus.forEach(order -> {
-            Date i=new Date();
+            Date i = new Date();
             try {
-                i=dateR.parse(order.getOrderTime());
+                i = dateR.parse(order.getOrderTime());
             } catch (ParseException e) {
                 e.printStackTrace();
             }
-            Integer num=hTimemax.compareTo(dateR.format(i));
-            if(num==0){
+            Integer num = hTimemax.compareTo(dateR.format(i));
+            if (num == 0) {
                 MessageCenterPo messageCenter = new MessageCenterPo();
                 //推送信息中心-账户通知
                 messageCenter.setShopId(null);
@@ -709,6 +707,6 @@ public class ShopMessTask {
             }
 
         });
-}
+    }
 
 }