From 5b01a6ab491d38c9fb84ba3bfaf1f4373b4a4410 Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Wed, 19 Jun 2024 10:56:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=94=B6=E9=93=B6=E5=8F=B0?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=9A=84=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/store/lists/store_order/StoreOrderLists.php b/app/store/lists/store_order/StoreOrderLists.php
index 12f7c7208..3c86ba983 100644
--- a/app/store/lists/store_order/StoreOrderLists.php
+++ b/app/store/lists/store_order/StoreOrderLists.php
@@ -46,13 +46,13 @@ class StoreOrderLists extends BaseAdminDataLists implements ListsSearchInterface
      */
     public function lists(): array
     {
-        $store_id = $this->adminInfo['store_id'];
+        $store_id = $this->adminInfo['store_id']??5;
         $this->searchWhere[] = ['store_id' ,'=',$store_id];
         $is_sashier=$this->request->get('is_sashier');
         if($is_sashier==1){//收银台订单
-            $this->searchWhere[] = ['pay_type','in',[17,9,13]];
+            $this->searchWhere[] = ['pay_type','in',[17,9,13,18]];
         }elseif($is_sashier==2){//小程序订单
-            $this->searchWhere[] = ['pay_type','in',[7,3]];
+            $this->searchWhere[] = ['pay_type','in',[7,3,18]];
         }
         return StoreOrder::where($this->searchWhere)
             ->field(['id', 'order_id', 'pay_price', 'pay_time', 'pay_type', 'status','paid'])