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();