From 43040c31d46956b59942205ec6c99765ade574e7 Mon Sep 17 00:00:00 2001
From: evoxwht <442384644@qq.com>
Date: Mon, 22 May 2023 09:09:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E5=8F=91=E8=B4=A7=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/app/listener/order/OrderShippingListener.php | 5 +++--
 crmeb/crmeb/traits/QueueTrait.php                  | 1 -
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/crmeb/app/listener/order/OrderShippingListener.php b/crmeb/app/listener/order/OrderShippingListener.php
index 02230dd5e..288f9b0a3 100644
--- a/crmeb/app/listener/order/OrderShippingListener.php
+++ b/crmeb/app/listener/order/OrderShippingListener.php
@@ -102,9 +102,10 @@ class OrderShippingListener implements ListenerInterface
                 throw new AdminException('订单支付人异常');
             }
             if ($secs) {
-                sleep($secs);
+                MiniOrderJob::dispatchSecs($secs, 'doJob', [$out_trade_no, $logistics_type, $shipping_list, $payer_openid, $path, $delivery_mode, $is_all_delivered]);
+            } else {
+                MiniOrderJob::dispatch('doJob', [$out_trade_no, $logistics_type, $shipping_list, $payer_openid, $path, $delivery_mode, $is_all_delivered]);
             }
-            MiniOrderJob::dispatch('doJob', [$out_trade_no, $logistics_type, $shipping_list, $payer_openid, $path, $delivery_mode, $is_all_delivered]);
         }
     }
 }
diff --git a/crmeb/crmeb/traits/QueueTrait.php b/crmeb/crmeb/traits/QueueTrait.php
index 8baa40eb1..eca335067 100644
--- a/crmeb/crmeb/traits/QueueTrait.php
+++ b/crmeb/crmeb/traits/QueueTrait.php
@@ -60,7 +60,6 @@ trait QueueTrait
             } else {
                 $res->$action(...$data);
             }
-
         }
     }