From bc056b892c4a79d836a052252584c65ec0e0547e Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Tue, 15 Oct 2024 16:38:34 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=9C=A8=E8=AE=A2=E5=8D=95=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E4=B8=AD=E6=B7=BB=E5=8A=A0=E5=BA=97=E9=93=BA=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在BeforehandOrderLogic类的getOrderDetail方法中，添加了系统店铺名称字段。此信息现在将通过SystemStore模型获取，并在返回的订单详情数组中提供，使得用户能够直接看到店铺名称，而不仅仅是店铺ID。
---
 app/admin/logic/beforehand_order/BeforehandOrderLogic.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/admin/logic/beforehand_order/BeforehandOrderLogic.php b/app/admin/logic/beforehand_order/BeforehandOrderLogic.php
index cbae51f2f..33b1908c7 100644
--- a/app/admin/logic/beforehand_order/BeforehandOrderLogic.php
+++ b/app/admin/logic/beforehand_order/BeforehandOrderLogic.php
@@ -16,6 +16,7 @@ use app\common\model\store_order\StoreOrder;
 use app\common\model\store_order_cart_info\StoreOrderCartInfo;
 use app\common\model\store_product\StoreProduct;
 use app\common\model\store_product_unit\StoreProductUnit;
+use app\common\model\system_store\SystemStore;
 use app\common\model\user\User;
 use app\common\model\user\UserAddress;
 use app\common\model\warehouse_order\WarehouseOrder;
@@ -436,6 +437,7 @@ class BeforehandOrderLogic extends BaseLogic
             $arr = StoreCategory::where('id', 'in', $top_cate_list)->field('name,id')->select();
             $res['top_cate'] = $arr?->toArray();
         }
+        $res['system_store']=SystemStore::where('id',$res['store_id'])->value('name');
         return $res;
     }
 }

From fc6ac5fdd3fde6eaea9ee0132f0681aaaf86e8e5 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Tue, 15 Oct 2024 16:41:19 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=9C=A8=E6=90=9C=E7=B4=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E4=B8=AD=E6=B7=BB=E5=8A=A0=E8=AE=A2=E5=8D=95=E7=BC=96?=
 =?UTF-8?q?=E5=8F=B7=EF=BC=88order=5Fsn=EF=BC=89=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在BeforehandOrderLists类的setSearch方法中，将订单编号（order_sn）字段添加到搜索条件中，以便能够按订单编号进行搜索和过滤。
---
 app/admin/lists/beforehand_order/BeforehandOrderLists.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/admin/lists/beforehand_order/BeforehandOrderLists.php b/app/admin/lists/beforehand_order/BeforehandOrderLists.php
index fa2d82b05..8a29d67b2 100644
--- a/app/admin/lists/beforehand_order/BeforehandOrderLists.php
+++ b/app/admin/lists/beforehand_order/BeforehandOrderLists.php
@@ -28,7 +28,7 @@ class BeforehandOrderLists extends BaseAdminDataLists implements ListsSearchInte
     public function setSearch(): array
     {
         return [
-            '=' => ['store_id', 'order_id', 'uid','paid','status','order_type'],
+            '=' => ['store_id', 'order_id', 'uid','paid','status','order_type','order_sn'],
         ];
     }