diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
index fb69d525..ac504e49 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
@@ -486,6 +486,7 @@ public class OrderController extends BaseController {
             // 预约时间
             paramsNew.put("time4", com.ghy.common.utils.DateUtils.parseDateToStr("yyyy年MM月dd日 HH:mm", om.getExpectTimeStart()));
             // 非自己承接的订单需要通知
+            logger.info("主订单师傅{}，派单师傅{}", om.getWorkerId(),request.getWorkerId());
             if (!om.getWorkerId().equals(request.getWorkerId())) {
                 WechatMsgUtils.sendWeChatMsg(WechatMsgUtils.getToken(), acceptWorker.getWxOpenId(), WxMsgEnum.NORMAL_ORDER, paramsNew);
             }
diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
index 05109248..f3b916c5 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
@@ -320,15 +320,17 @@ public class OrderMasterController extends BaseController {
             try {
                 Worker assignWorker = workerService.selectById(orderMaster.getWorkerId());
                 // 消息组装。
-                Map<String, Object> params = new HashMap<>();
+                Map<String, Object> paramsNew = new HashMap<>();
                 // 订单编号
-                params.put("character_string6", master.getCode());
+                paramsNew.put("thing21", "您帐号收到1条新订单");
                 // 名称
-                params.put("thing14", "收到新订单");
+                paramsNew.put("thing31", "请进入【我的订单--新订单】操作处理");
+                CustomerAddress address = customerAddressService.selectByCustomerAddressId(master.getAddressId());
+                paramsNew.put("thing14", address.getName());
                 // 预约时间
-                params.put("time4", com.ghy.common.utils.DateUtils.parseDateToStr("yyyy年MM月dd日 HH:mm", master.getExpectTimeStart()));
+                paramsNew.put("time4", com.ghy.common.utils.DateUtils.parseDateToStr("yyyy年MM月dd日 HH:mm", master.getExpectTimeStart()));
                 // 消息推送
-                WechatMsgUtils.sendWeChatMsg(WechatMsgUtils.getToken(), assignWorker.getWxOpenId(), WxMsgEnum.TEXT, params);
+                WechatMsgUtils.sendWeChatMsg(WechatMsgUtils.getToken(), assignWorker.getWxOpenId(), WxMsgEnum.NORMAL_ORDER, paramsNew);
             } catch (Exception e) {
                 // 暂时不做任何操作。
                 logger.error(e.getMessage(), e);
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 e8ff428f..5c601d55 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
@@ -364,6 +364,7 @@ public class OrderServiceImpl implements OrderService {
                 // 服务中状态要按预计上门时间计算4h超时
                 // Date overTime = DateUtils.addMilliseconds(order.getUpdateTime(), 4 * 60 * 60 * 1000);
                 Date overTime=calculateOverTime(order.getUpdateTime());
+                log.info("订单[{}]服务中状态超时4小时 4小时后的时间", overTime);
                 if (overTime.before(now)) {
                     log.info("订单[{}]服务中状态超时4小时 扣款", order.getId());
                     OrderTimeoutRecord record = new OrderTimeoutRecord(order.getId(), order.getWorkerId(), order.getDeptId(), order.getOrderStatus());