From 3c958a2923e5a303f02fec35c08ae48c56489908 Mon Sep 17 00:00:00 2001 From: cb <275647614@qq.com> Date: Tue, 6 May 2025 15:06:10 +0800 Subject: [PATCH] no message --- .../src/main/resources/mapper/order/OrderMasterMapper.xml | 6 ++++-- .../java/com/ghy/quartz/service/impl/OrderServiceImpl.java | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml index 176594f0..e3034597 100644 --- a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml +++ b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml @@ -96,7 +96,8 @@ city_name , country_name , street_name , - phone + phone, + has_dispatched_all FROM order_master @@ -143,7 +144,8 @@ om.city_name , om.country_name , om.street_name , - om.phone + om.phone, + om.has_dispatched_all FROM order_master om LEFT JOIN customer_address ca ON ca.customer_address_id = om.address_id LEFT JOIN goods g ON g.goods_id = om.goods_id 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 b13955be..cc51dcb6 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 @@ -224,7 +224,7 @@ public class OrderServiceImpl implements OrderService { log.info("主订单是否未约未排[{}]派单工id{}", order.getIsCall(),order.getWorkerId()); if (overTime30min.before(now)) { // 30min未接单为超时 - log.info("主订单[{}]超时30分钟", order.getId()); + log.info("主订单[{}]超时30分钟未排的参数{}", order.getId(),order.getHasDispatchedAll()); orderMasterService.updateTimeout(order.getId(), 1); timeout = true; //主单超时未约未排