From dde04d33d79215b0c8d781168e0174818df047ca Mon Sep 17 00:00:00 2001
From: cb <642514070@qq.com>
Date: Sun, 20 Apr 2025 09:29:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9C=AA=E7=BA=A6=E6=9C=AA?=
 =?UTF-8?q?=E6=8E=92=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ghy/quartz/service/impl/OrderServiceImpl.java    | 4 ++--
 1 file changed, 2 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 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 {