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(); } }