From 1fd70503c03af56507d00eb88558b07c13538ffa Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Fri, 5 Jul 2024 18:58:28 +0800
Subject: [PATCH] =?UTF-8?q?feat(StoreOrderLists):=20=E6=A0=B9=E6=8D=AE?=
 =?UTF-8?q?=E6=94=B6=E9=93=B6=E5=8F=B0=E5=92=8C=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=B0=83=E6=95=B4=E6=9F=A5=E8=AF=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/store/lists/store_order/StoreOrderLists.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/store/lists/store_order/StoreOrderLists.php b/app/store/lists/store_order/StoreOrderLists.php
index 7f1d9b8a4..da9681ce1 100644
--- a/app/store/lists/store_order/StoreOrderLists.php
+++ b/app/store/lists/store_order/StoreOrderLists.php
@@ -48,8 +48,8 @@ class StoreOrderLists extends BaseAdminDataLists implements ListsSearchInterface
     {
         $store_id = $this->adminInfo['store_id'] ?? 5;
         $is_sashier = $this->request->get('is_sashier');
+        $this->searchWhere[] = ['store_id', '=', $store_id];
         if ($is_sashier == 1) { //收银台订单
-            $this->searchWhere[] = ['store_id', '=', $store_id];
             $this->searchWhere[] = ['source', '=', 1];
         } elseif ($is_sashier == 2) { //小程序订单
             $this->searchWhere[] = ['source', '=', 0];
@@ -74,7 +74,7 @@ class StoreOrderLists extends BaseAdminDataLists implements ListsSearchInterface
             ->field(['id', 'order_id', 'pay_price', 'pay_time','uid', 'pay_type', 'status', 'paid', 'total_num'])
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
-            ->select()->each(function ($item) use ($store_id) {
+            ->select()->each(function ($item){
                 if (empty($item['pay_time'])) {
                     $item['pay_time'] = '';
                 }else{