From a3628b23611bff66d74b78e0738ba421ed1ea53c Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Thu, 13 Jul 2023 14:26:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BE=85=E4=BB=98=E6=AC=BE?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=9A=84=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repositories/store/order/StoreGroupOrderRepository.php      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/common/repositories/store/order/StoreGroupOrderRepository.php b/app/common/repositories/store/order/StoreGroupOrderRepository.php
index e411afa0..55082cbc 100644
--- a/app/common/repositories/store/order/StoreGroupOrderRepository.php
+++ b/app/common/repositories/store/order/StoreGroupOrderRepository.php
@@ -71,7 +71,7 @@ class StoreGroupOrderRepository extends BaseRepository
         }
         $query->when(isset($where['paid']) && $where['paid'] !== '', function ($query) use ($where) {
             if ($where['paid'] == 0) {
-                $query->whereRaw("StoreGroupOrder.paid=0 or (StoreGroupOrder.paid=1 and StoreGroupOrder.pay_type=8 and StoreOrder.status=2)");
+                $query->whereRaw("(StoreGroupOrder.paid=0 and status!=12) or (StoreGroupOrder.paid=1 and StoreGroupOrder.pay_type=8 and StoreOrder.status=2)");
             } else {
                 $query->where('StoreGroupOrder.paid', $where['paid']);
             }