From ecb73483764cf3f75a8d41f6c3f2c2985890177d Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Sat, 8 Jul 2023 14:57:10 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BF=A1=E7=94=A8=E8=B4=AD?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/dao/store/order/StoreGroupOrderDao.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/common/dao/store/order/StoreGroupOrderDao.php b/app/common/dao/store/order/StoreGroupOrderDao.php
index f34da989..42caf20d 100644
--- a/app/common/dao/store/order/StoreGroupOrderDao.php
+++ b/app/common/dao/store/order/StoreGroupOrderDao.php
@@ -65,7 +65,11 @@ class StoreGroupOrderDao extends BaseDao
         }
         return StoreGroupOrder::hasWhere('orderList', $storeOrderWhere)
         ->when(isset($where['paid']) && $where['paid'] !== '', function ($query) use ($where) {
-            $query->where('StoreGroupOrder.paid', $where['paid']);
+            if ($where['paid'] == 0) {
+                $query->whereRaw("StoreGroupOrder.paid=0 or (StoreGroupOrder.paid=1 and StoreGroupOrder.pay_type=8)");
+            } else {
+                $query->where('StoreGroupOrder.paid', $where['paid']);
+            }
         })->when(isset($where['uid']) && $where['uid'] !== '', function ($query) use ($where) {
             $query->where('StoreGroupOrder.uid', $where['uid']);
         })->order('create_time DESC')->when(isset($where['is_del']) && $where['is_del'] !== '', function ($query) use ($where) {