From c5a21a867b50727d5357455e5f426415a500b8c4 Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Wed, 26 Jun 2024 18:32:27 +0800
Subject: [PATCH] =?UTF-8?q?=E9=99=90=E5=88=B6=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/lists/order/OrderList.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/api/lists/order/OrderList.php b/app/api/lists/order/OrderList.php
index 86a4e5378..e97c09067 100644
--- a/app/api/lists/order/OrderList.php
+++ b/app/api/lists/order/OrderList.php
@@ -46,7 +46,8 @@ class OrderList extends BaseAdminDataLists implements ListsSearchInterface
     {
         $userId = $this->request->userId;
         if (!$userId) return [];
-        $data =  StoreOrder::with(['store'])->where($this->searchWhere)->where('uid', $userId)
+        $data =  StoreOrder::with(['store'])->where($this->searchWhere)->where(['uid'=>$userId])
+            ->whereIn('shipping_type',[1,2])
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
             ->select()
@@ -86,6 +87,6 @@ class OrderList extends BaseAdminDataLists implements ListsSearchInterface
     public function count(): int
     {
         $userId = $this->request->userId;
-        return StoreOrder::where($this->searchWhere)->where('uid', $userId)->count();
+        return StoreOrder::where($this->searchWhere)->whereIn('shipping_type',[1,2])->where('uid', $userId)->count();
     }
 }