From 9eafcde2c7afe6ee8290be7b0e078dffca09ad32 Mon Sep 17 00:00:00 2001 From: luofei <604446095@qq.com> Date: Sat, 8 Jul 2023 16:46:29 +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=E6=95=B0=E9=87=8F=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/dao/store/order/StoreGroupOrderDao.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/app/common/dao/store/order/StoreGroupOrderDao.php b/app/common/dao/store/order/StoreGroupOrderDao.php index 42caf20d..4c15e208 100644 --- a/app/common/dao/store/order/StoreGroupOrderDao.php +++ b/app/common/dao/store/order/StoreGroupOrderDao.php @@ -48,7 +48,7 @@ class StoreGroupOrderDao extends BaseDao $storeOrderWhere = StoreOrder::where('activity_type', $productType); return StoreGroupOrder::hasWhere('orderList', $storeOrderWhere)->when($uid, function ($query, $uid) { $query->where('StoreGroupOrder.uid', $uid); - })->where('StoreGroupOrder.is_del', 0)->where('StoreGroupOrder.paid', 0)->count(); + })->where('StoreGroupOrder.is_del', 0)->whereRaw("StoreGroupOrder.paid=0 or (StoreGroupOrder.paid=1 and StoreGroupOrder.pay_type=8)")->count(); } /** @@ -60,9 +60,6 @@ class StoreGroupOrderDao extends BaseDao public function search(array $where) { $storeOrderWhere = StoreOrder::where('activity_type', $where['product_type']); - if (isset($where['paid']) && $where['paid'] == 0) { - $storeOrderWhere->whereRaw("StoreGroupOrder.paid=0 or (StoreGroupOrder.paid=1 and StoreGroupOrder.pay_type=8)"); - } return StoreGroupOrder::hasWhere('orderList', $storeOrderWhere) ->when(isset($where['paid']) && $where['paid'] !== '', function ($query) use ($where) { if ($where['paid'] == 0) {