Merge branch 'feature/purchase_record' into dev

This commit is contained in:
luofei 2023-07-13 17:47:31 +08:00
commit e518ad5953
2 changed files with 3 additions and 1 deletions

View File

@ -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();
}
/**

View File

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