From 5d98a21315ba940a09f25251771bf331395df4e6 Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Tue, 11 Jul 2023 17:10:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=95=B0=E9=87=8F=E7=9A=84=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/dao/store/order/StoreOrderDao.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/common/dao/store/order/StoreOrderDao.php b/app/common/dao/store/order/StoreOrderDao.php
index c2587057..f9ae2f65 100644
--- a/app/common/dao/store/order/StoreOrderDao.php
+++ b/app/common/dao/store/order/StoreOrderDao.php
@@ -98,7 +98,7 @@ class StoreOrderDao extends BaseDao
             ->when(isset($where['status']) && $where['status'] !== '', function ($query) use ($where) {
                 switch ($where['status']) {
                     case 0 :
-                        $query->whereIn('StoreOrder.status', [0, 9]);
+                        $query->where('paid', 1)->whereIn('StoreOrder.status', [0, 9]);
                         break;
                     case -2 :
                         $query->whereNotIn('StoreOrder.status', [10, 11]);
@@ -107,13 +107,13 @@ class StoreOrderDao extends BaseDao
                         $query->where('paid', 1)->whereIn('StoreOrder.status', [10, 11]);
                         break;
                     case 2 :
-                        $query->where('StoreOrder.status', $where['status'])->where('pay_type', '<>', StoreGroupOrder::PAY_TYPE_CREDIT_BUY);
+                        $query->where('paid', 1)->where('StoreOrder.status', $where['status'])->where('pay_type', '<>', StoreGroupOrder::PAY_TYPE_CREDIT_BUY);
                         break;
                     case 20 :
-                        $query->where('StoreOrder.status', 2);
+                        $query->where('paid', 1)->where('StoreOrder.status', 2);
                         break;
                     default:
-                        $query->where('StoreOrder.status', $where['status']);
+                        $query->where('paid', 1)->where('StoreOrder.status', $where['status']);
                         break;
                 }
             })