From b0c651818d88523636e76a05c9d29400d64f1835 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=9D=99?= <lym125@gmail.com>
Date: Thu, 20 Jan 2022 17:26:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BB=8F=E9=94=80=E5=95=86?=
 =?UTF-8?q?=E5=91=BD=E4=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Commands/Dealer/OrderAutoAllocate.php     | 14 +++---
 .../Commands/Dealer/OrderProcessCommand.php   | 10 +++--
 .../Commands/Dealer/OrderSettleCommand.php    | 44 ++++++++++++-------
 3 files changed, 41 insertions(+), 27 deletions(-)

diff --git a/app/Console/Commands/Dealer/OrderAutoAllocate.php b/app/Console/Commands/Dealer/OrderAutoAllocate.php
index 6b7ba32e..7fe18a25 100644
--- a/app/Console/Commands/Dealer/OrderAutoAllocate.php
+++ b/app/Console/Commands/Dealer/OrderAutoAllocate.php
@@ -32,7 +32,7 @@ class OrderAutoAllocate extends Command
      */
     public function handle()
     {
-        do {
+        while (true) {
             $page = 0;
 
             DealerOrder::where('status', DealerOrderStatus::Pending)
@@ -57,13 +57,13 @@ class OrderAutoAllocate extends Command
                         $page++;
                     });
 
-            if ($page > 1) {
-                sleep(15);
-            } else {
+            if ($page === 0) {
                 sleep(60);
+            } elseif ($page === 1) {
+                sleep(30);
+            } else {
+                sleep(15);
             }
-        } while (true);
-
-        return 0;
+        }
     }
 }
diff --git a/app/Console/Commands/Dealer/OrderProcessCommand.php b/app/Console/Commands/Dealer/OrderProcessCommand.php
index cd974f6d..af2d31bb 100644
--- a/app/Console/Commands/Dealer/OrderProcessCommand.php
+++ b/app/Console/Commands/Dealer/OrderProcessCommand.php
@@ -40,7 +40,7 @@ class OrderProcessCommand extends Command
      */
     public function handle()
     {
-        do {
+        while (true) {
             $page = 0;
 
             DealerOrder::where(
@@ -70,11 +70,13 @@ class OrderProcessCommand extends Command
             });
 
             if ($page === 0) {
-                sleep(30);
+                sleep(60);
             } elseif ($page === 1) {
-                sleep(5);
+                sleep(30);
+            } else {
+                sleep(15);
             }
-        } while (true);
+        };
 
         return 0;
     }
diff --git a/app/Console/Commands/Dealer/OrderSettleCommand.php b/app/Console/Commands/Dealer/OrderSettleCommand.php
index 74886514..1eb5a4d1 100644
--- a/app/Console/Commands/Dealer/OrderSettleCommand.php
+++ b/app/Console/Commands/Dealer/OrderSettleCommand.php
@@ -40,28 +40,40 @@ class OrderSettleCommand extends Command
      */
     public function handle()
     {
-        DealerOrder::where([
-            'status' => DealerOrderStatus::Completed,
-            'settle_state' => DealerOrderSettleState::Processed,
-        ])->whereNotNull('shippinged_time')->chunkById(200, function ($orders) {
-            $orders->load('dealer.userInfo');
+        while (true) {
+            $page = 0;
 
-            foreach ($orders as $order) {
-                try {
-                    DB::beginTransaction();
+            DealerOrder::where([
+                'status' => DealerOrderStatus::Completed,
+                'settle_state' => DealerOrderSettleState::Processed,
+            ])->whereNotNull('shippinged_time')->chunkById(200, function ($orders, &$page) {
+                $orders->load('dealer.userInfo');
 
-                    $this->handleDealerOrder($order);
+                foreach ($orders as $order) {
+                    try {
+                        DB::beginTransaction();
 
-                    DB::commit();
-                } catch (Throwable $e) {
-                    DB::rollBack();
+                        $this->handleDealerOrder($order);
 
-                    report($e);
+                        DB::commit();
+                    } catch (Throwable $e) {
+                        DB::rollBack();
+
+                        report($e);
+                    }
                 }
-            }
-        });
 
-        return 0;
+                $page++;
+            });
+
+            if ($page === 0) {
+                sleep(60);
+            } elseif ($page === 1) {
+                sleep(30);
+            } else {
+                sleep(15);
+            }
+        }
     }
 
     /**