From dd43a90d15a510b342fe8b88090e4e1ea76da53d Mon Sep 17 00:00:00 2001
From: Hawking <hhawking@qq.com>
Date: Wed, 10 May 2023 14:01:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E5=8D=95=E7=9A=84update=5Ftime?=
 =?UTF-8?q?=E4=B8=BAnull=EF=BC=8C=E6=94=B9=E4=B8=BA=E7=94=A8create=5Ftime?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E8=B6=85=E6=97=B6?=
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 6e7444d7..651967f8 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
@@ -82,7 +82,7 @@ public class OrderServiceImpl implements OrderService {
         // 是否超时
         boolean timeout = ONE.equals(order.getTimeout());
         if (timeout) {
-            Date overTime = getOverTime(order.getUpdateTime(), 60 * 60 * 1000);
+            Date overTime = getOverTime(order.getCreateTime(), 60 * 60 * 1000);
             if (overTime.before(now)) {
                 log.info("主订单[{}]超时60分钟", order.getId());
                 // 已超时 60min后取消超时状态 清空workerId
@@ -90,7 +90,7 @@ public class OrderServiceImpl implements OrderService {
                 orderMasterService.removeWorker(order.getId());
             }
         } else {
-            Date overTime = getOverTime(order.getUpdateTime(), 30 * 60 * 1000);
+            Date overTime = getOverTime(order.getCreateTime(), 30 * 60 * 1000);
             if (overTime.before(now)) {
                 // 30min未接单为超时
                 log.info("主订单[{}]超时30分钟", order.getId());