From 16586fd5e7200e1a2620e6f4867ed9525597d2eb Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Thu, 6 Jun 2024 17:36:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=97=E9=93=BA=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/lists/store_order/StoreOrderLists.php | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/admin/lists/store_order/StoreOrderLists.php b/app/admin/lists/store_order/StoreOrderLists.php
index 386adb466..333a27f12 100644
--- a/app/admin/lists/store_order/StoreOrderLists.php
+++ b/app/admin/lists/store_order/StoreOrderLists.php
@@ -60,11 +60,8 @@ class StoreOrderLists extends BaseAdminDataLists implements ListsSearchInterface
                 $query->where('store_id', '=', $this->request->adminInfo['store_id']);
             })
             ->when(!empty($this->params['status']), function ($query) {
-                if (is_array($this->params['status'])) {
-                    $query->whereIn('status', $this->params['status']);
-                } else {
-                    $query->where('status', $this->params['status']);
-                }
+                $status = explode(',', $this->params['status']);
+                $query->whereIn('status', $status);
             })
             ->field(['id', 'store_id', 'staff_id', 'order_id', 'pay_price', 'pay_time', 'pay_type', 'status', 'uid'])
             ->limit($this->limitOffset, $this->limitLength)
@@ -93,9 +90,6 @@ class StoreOrderLists extends BaseAdminDataLists implements ListsSearchInterface
     public function count(): int
     {
         return StoreOrder::where($this->searchWhere)
-            ->when(!empty($this->request->adminInfo['store_id']), function ($query) {
-                $query->where('store_id', '=', $this->request->adminInfo['store_id']);
-            })
             ->when(!empty($this->params['start_time']), function ($query) {
                 $query->whereTime('create_time', '>=', $this->params['start_time']);
             })
@@ -105,6 +99,13 @@ class StoreOrderLists extends BaseAdminDataLists implements ListsSearchInterface
                 }
                 $query->whereTime('create_time', '<=', $this->params['end_time']);
             })
+            ->when(!empty($this->request->adminInfo['store_id']), function ($query) {
+                $query->where('store_id', '=', $this->request->adminInfo['store_id']);
+            })
+            ->when(!empty($this->params['status']), function ($query) {
+                $status = explode(',', $this->params['status']);
+                $query->whereIn('status', $status);
+            })
             ->count();
     }