From 3f726ca43924b3cc86afbcbf1a18ffdc9d3d214d Mon Sep 17 00:00:00 2001
From: cb <275647614@qq.com>
Date: Thu, 17 Apr 2025 11:31:39 +0800
Subject: [PATCH] no message

---
 .../java/com/ghy/common/enums/WxMsgEnum.java  |  4 +--
 .../quartz/service/impl/OrderServiceImpl.java | 27 +++++++++++++++++++
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/ghy-common/src/main/java/com/ghy/common/enums/WxMsgEnum.java b/ghy-common/src/main/java/com/ghy/common/enums/WxMsgEnum.java
index d2b32a3f..4c9e4064 100644
--- a/ghy-common/src/main/java/com/ghy/common/enums/WxMsgEnum.java
+++ b/ghy-common/src/main/java/com/ghy/common/enums/WxMsgEnum.java
@@ -27,7 +27,7 @@ public enum WxMsgEnum {
     AFTER_SALES_TIMEOUT_ORDER("", "2uC9_lXInXg0_7Bu7N6YVBOgolTxaNcwRXQPF0H-Di0"),
     /**服务工单超时通知**/
     TIMEOUT_ORDER("", "xdWLWqUbNY2iPYSDxG04Dr2fSTktqXN23xsoBU_9zhc"),
-    /** 明日单通知/一小时订单   工单处理提醒*/
+    /** 一小时订单   工单处理提醒*/
     ONEHOUR_ORDER("", "HZ1R0FU7Zn6C-bxG3X6yPnhq2beT5MhRZHtnS8PifiA"),
     /** 急报 **/
     WARN_ORDER("", "0RSuVHHP_okErJ1acQmIirBU7TrQYR0xPBgBHyt_azA"),
@@ -39,7 +39,7 @@ public enum WxMsgEnum {
     /** 今日单消息通知 */
 //    TODAY_ORDER("", "yqd3p4qsqn1RiyUb8kO4dPqoGKipRQg_y99nGw0jtLE"),
     /** 明日单通知   工单处理提醒*/
-    TOMORROW_ORDER("", "HZ1R0FU7Zn6C-bxG3X6yPnhq2beT5MhRZHtnS8PifiA");
+    TOMORROW_ORDER("", "HZ1R0FU7Zn6C-bxG3X6yPubwn-jGgQHhi16Q57R2S5g");
     /** 不同意排单通知 */
 //    NOT_AGREE_PLAIN("", "yqd3p4qsqn1RiyUb8kO4dPqoGKipRQg_y99nGw0jtLE"),
     /** 不同意完单通知 */
diff --git a/ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java b/ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java
index 8467f9ca..c5675339 100644
--- a/ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java
+++ b/ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java
@@ -319,6 +319,11 @@ public class OrderServiceImpl implements OrderService {
                 Date overTime = DateUtils.addMilliseconds(order.getExpectTimeStart(), 30 * 60 * 1000);
 
                 Date oneHourTime=DateUtils.addMilliseconds(order.getExpectTimeStart(), -60 * 60 * 1000);
+
+                // 1. 定位到今日 00:00
+                Date todayStart = DateUtils.truncate(order.getExpectTimeStart(), Calendar.DATE);
+                // 2. 增加 1 天
+                Date tomorrowStart = DateUtils.addDays(todayStart, 1);
                 log.info("订单开始前一个小时 订单号：[{}]时间：{} 当前时间 {}", order.getId(),oneHourTime,now);
                 if (overTime.before(now)) {
                     log.info("订单[{}]待上门状态超时30分钟", order.getId());
@@ -371,6 +376,28 @@ public class OrderServiceImpl implements OrderService {
                         log.error(e.getMessage(), e);
                     }
                 }
+                if(now.before(tomorrowStart)){
+                    log.info("订单[{}]明日订单通知", order.getId());
+                    try {
+                        // 推送公众号通知数据。
+                        Worker worker = workerService.selectById(order.getWorkerId());
+                        OrderMaster orderMaster = orderMasterService.selectById(order.getOrderMasterId());
+                        // 消息组装。
+                        Map<String, Object> paramsNew = new HashMap<>();
+                        // 订单编号
+                        paramsNew.put("thing13", "您有1条订单明日待上门/待服务");
+                        // 名称
+                        paramsNew.put("thing7", "进入【我的订单--明日单】查看和准备");
+                        CustomerAddress address = customerAddressService.selectByCustomerAddressId(orderMaster.getAddressId());
+                        paramsNew.put("thing9", address.getName());
+                        // 预约时间
+                        paramsNew.put("time4", com.ghy.common.utils.DateUtils.parseDateToStr("yyyy年MM月dd日 HH:mm", new Date()));
+                        WechatMsgUtils.sendWeChatMsg(WechatMsgUtils.getToken(), worker.getWxOpenId(), WxMsgEnum.TOMORROW_ORDER, paramsNew);
+
+                    } catch (Exception e) {
+                        log.error(e.getMessage(), e);
+                    }
+                }
             }
             // 未超时的单
             else if (order.getOrderStatus().equals(OrderStatus.SERVER.code())) {