From 89a9c13822b4a18399e0a398ac2e76ed26b302f8 Mon Sep 17 00:00:00 2001 From: YiFei Kuang Date: Mon, 14 Apr 2025 10:55:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=90=E5=8D=95=E6=9C=AA=E7=BA=A6=E6=9C=AA?= =?UTF-8?q?=E6=8E=92=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ghy/quartz/service/impl/OrderServiceImpl.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) 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 842a66b0..b4880c4c 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 @@ -7,9 +7,11 @@ import com.ghy.common.utils.WechatMsgUtils; import com.ghy.customer.domain.CustomerAddress; import com.ghy.customer.service.CustomerAddressService; import com.ghy.order.domain.AfterServiceRecord; +import com.ghy.order.domain.OrderCallRecord; import com.ghy.order.domain.OrderDetail; import com.ghy.order.domain.OrderMaster; import com.ghy.order.service.IAfterServiceRecordService; +import com.ghy.order.service.IOrderCallRecordService; import com.ghy.order.service.OrderDetailService; import com.ghy.order.service.OrderMasterService; import com.ghy.payment.domain.FinancialDetail; @@ -79,6 +81,8 @@ public class OrderServiceImpl implements OrderService { private WorkerService workerService; @Autowired private CustomerAddressService customerAddressService; + @Autowired + private IOrderCallRecordService orderCallRecordService; @Override public void overTimeOrder(String orderStatus) { @@ -335,8 +339,12 @@ public class OrderServiceImpl implements OrderService { if (overTime.before(now)) { log.info("订单[{}]超时30分钟", order.getId()); orderDetailService.updateTimeout(order.getId(), 1, 0); + // 判断是否约单 + OrderCallRecord param = new OrderCallRecord(); + param.setOrderId(order.getId()); + List list = orderCallRecordService.selectOrderCallRecordList(param); // 超时预约通知 - if("01".equals(order.getIsCall())){ + if(CollectionUtil.isEmpty(list)){ // 通知师傅新订单 try { // 推送公众号通知数据。 @@ -359,7 +367,7 @@ public class OrderServiceImpl implements OrderService { } } // 超时未排单 - if("02".equals(order.getIsCall())){ + if(CollectionUtil.isNotEmpty(list)){ // 通知师傅新订单 try { // 推送公众号通知数据。