From 63632b57053e34a607705c33d610aa4367722120 Mon Sep 17 00:00:00 2001 From: luofei <604446095@qq.com> Date: Thu, 13 Jul 2023 17:44:56 +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=BB=9F=E8=AE=A1=E7=9A=84=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/dao/store/order/StoreGroupOrderDao.php | 2 +- app/common/repositories/store/order/StoreOrderRepository.php | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/common/dao/store/order/StoreGroupOrderDao.php b/app/common/dao/store/order/StoreGroupOrderDao.php index 00ccba01..3cade7b6 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)->whereRaw("StoreGroupOrder.paid=0 or (StoreGroupOrder.paid=1 and StoreGroupOrder.pay_type=8 and StoreOrder.status=2)")->count(); + })->where('StoreGroupOrder.is_del', 0)->whereRaw("(StoreGroupOrder.paid=0 and status!=12) or (StoreGroupOrder.paid=1 and StoreGroupOrder.pay_type=8 and StoreOrder.status=2)")->count(); } /** diff --git a/app/common/repositories/store/order/StoreOrderRepository.php b/app/common/repositories/store/order/StoreOrderRepository.php index 19eea25d..a1495939 100644 --- a/app/common/repositories/store/order/StoreOrderRepository.php +++ b/app/common/repositories/store/order/StoreOrderRepository.php @@ -2504,6 +2504,8 @@ class StoreOrderRepository extends BaseRepository //订单结算之后,修改订单支付方式为真实的支付方式 $groupOrder->pay_type = $type; $groupOrder->save(); + $order->pay_type = $type; + $order->save(); } $groupOrder->interest->save(); Db::commit();