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 { // 推送公众号通知数据。