From 520cb5875b7f6f80390e1ff72dde14cd03a66f60 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Mon, 11 Nov 2024 11:26:32 +0800
Subject: [PATCH] =?UTF-8?q?fix(admin):=20=E4=BF=AE=E6=AD=A3=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E6=97=B6=E9=97=B4=E8=AE=A1=E7=AE=97=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将存储时间、配送时间和分割时间的计算逻辑从 $data 数组修改为 $order 数组
- 优化了时间判断和计算的代码结构，提高了代码可读性和维护性
---
 .../logic/beforehand_order/BeforehandOrderLogic.php    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/admin/logic/beforehand_order/BeforehandOrderLogic.php b/app/admin/logic/beforehand_order/BeforehandOrderLogic.php
index c849b3d2..31de8898 100644
--- a/app/admin/logic/beforehand_order/BeforehandOrderLogic.php
+++ b/app/admin/logic/beforehand_order/BeforehandOrderLogic.php
@@ -563,14 +563,14 @@ class BeforehandOrderLogic extends BaseLogic
         // 判断时间是否小于18点
         if ($hour < 18) {
             // 时间小于18点的逻辑
-            $data['storage_time'] = $dateTime->modify('+60 minutes')->format('Y-m-d H:i:s');
-            $data['delivery_time'] = $dateTime->modify('+90 minutes')->format('Y-m-d H:i:s');
+            $order['storage_time'] = $dateTime->modify('+60 minutes')->format('Y-m-d H:i:s');
+            $order['delivery_time'] = $dateTime->modify('+90 minutes')->format('Y-m-d H:i:s');
         } else {
             // 时间大于或等于18点的逻辑
-            $data['storage_time'] = $dateTime->modify('+150 minutes')->format('Y-m-d H:i:s');
-            $data['delivery_time'] = $dateTime->modify('+205 minutes')->format('Y-m-d H:i:s');
+            $order['storage_time'] = $dateTime->modify('+150 minutes')->format('Y-m-d H:i:s');
+            $order['delivery_time'] = $dateTime->modify('+205 minutes')->format('Y-m-d H:i:s');
         }
-        $data['split_time'] = $dateTime->modify('+10 minutes')->format('Y-m-d H:i:s');
+        $order['split_time'] = $dateTime->modify('+10 minutes')->format('Y-m-d H:i:s');
         $file_path = $order_allocation->export($data, $order, $other_data);
         return $file_path;
     }