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 54677b40..67bbe8ed 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 @@ -221,13 +221,13 @@ public class OrderServiceImpl implements OrderService { boolean timeout = ONE.equals(order.getTimeout()); Integer fineTimes = order.getTimeoutFineTimes(); if (!timeout) { - if (overTime30min.before(now)) { + log.info("主订单是否未约未排[{}]派单工id{}", order.getIsCall(),order.getWorkerId()); + if (overTime30min.before(now)&&order.getWorkerId() == null) { // 30min未接单为超时 log.info("主订单[{}]超时30分钟", order.getId()); orderMasterService.updateTimeout(order.getId(), 1); timeout = true; //主单超时未约未排 - log.info("主订单是否未约未排[{}]", order.getIsCall()); if (order.getIsCall().equals("01")) { log.info("主订单未约[{}]", order.getIsCall()); try {