From 349b6c3f5facc82c385e01b35b6bd986862fc7c5 Mon Sep 17 00:00:00 2001
From: lewis <604446095@qq.com>
Date: Wed, 8 Jan 2025 17:30:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=A8=E5=BA=97=E9=A2=84?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=95=86=E5=93=81=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../beforehand_order/BeforehandOrderLists.php   |  2 +-
 .../BeforehandOrderController.php               | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/app/admin/lists/beforehand_order/BeforehandOrderLists.php b/app/admin/lists/beforehand_order/BeforehandOrderLists.php
index 44ec378fc..a33469285 100644
--- a/app/admin/lists/beforehand_order/BeforehandOrderLists.php
+++ b/app/admin/lists/beforehand_order/BeforehandOrderLists.php
@@ -33,7 +33,7 @@ class BeforehandOrderLists extends BaseAdminDataLists implements ListsSearchInte
     public function setSearch(): array
     {
         return [
-            '=' => ['store_id', 'paid', 'status', 'order_type'],
+            '=' => ['store_id', 'paid', 'status', 'order_type', 'admin_id'],
             '%like' => ['order_id','order_sn'],
             '%like%' => ['mark'],
             'between_time' => 'create_time'
diff --git a/app/store/controller/beforehand_order/BeforehandOrderController.php b/app/store/controller/beforehand_order/BeforehandOrderController.php
index 2ef17978b..9f5002491 100644
--- a/app/store/controller/beforehand_order/BeforehandOrderController.php
+++ b/app/store/controller/beforehand_order/BeforehandOrderController.php
@@ -2,6 +2,9 @@
 
 namespace app\store\controller\beforehand_order;
 
+use app\admin\lists\store_product\StoreProductLists;
+use app\admin\logic\store_product\StoreProductLogic;
+use app\admin\validate\store_product\StoreProductValidate;
 use app\store\controller\BaseAdminController;
 use app\admin\lists\beforehand_order\BeforehandOrderLists;
 use app\admin\lists\beforehand_order\BeforehandOrderTwoLists;
@@ -36,6 +39,7 @@ class BeforehandOrderController extends BaseAdminController
     {
         $params = $this->request->get();
         $params['store_id'] = $this->request->adminInfo['store_id'] ?? 0;
+        $params['admin_id'] = $this->request->adminInfo['admin_id'] ?? 0;
         $this->request->setGet($params);
         return $this->dataLists(new BeforehandOrderLists());
     }
@@ -308,4 +312,17 @@ class BeforehandOrderController extends BaseAdminController
         $file_path = BeforehandOrderLogic::ReturnSupplier($params);
         return $this->success('导出成功', ['url' => $file_path]);
     }
+
+    public function productLists()
+    {
+        return $this->dataLists(new StoreProductLists());
+    }
+
+    public function productDetail()
+    {
+        $params = (new StoreProductValidate())->goCheck('detail');
+        $result = StoreProductLogic::detail($params);
+        return $this->data($result);
+    }
+
 }