|
@@ -4123,8 +4123,8 @@ class WholeController extends Curd
|
|
|
$payWay = '组合支付';
|
|
|
} elseif (count($payDetails) == 1) {
|
|
|
$payWayEn = OrderService::getPayWayByPrepayId($payDetails[0]['pay_prepayid']);
|
|
|
- $payWay='';
|
|
|
- if (!empty($payWayEn)){
|
|
|
+ $payWay = '';
|
|
|
+ if (!empty($payWayEn)) {
|
|
|
$payWay = OrderService::$payWay[$payWayEn];
|
|
|
}
|
|
|
}
|
|
@@ -4284,8 +4284,9 @@ class WholeController extends Curd
|
|
|
}
|
|
|
}
|
|
|
$goodsCount = count($goods);
|
|
|
+ $goodsIds = array_column($goods, 'goods_id');
|
|
|
foreach ($goods as $good) {
|
|
|
- $payAmount = OrderService::useCoupon($memberId, $good, $goodsCount, $coupon, $payAmount, $totalAmount);
|
|
|
+ $payAmount = OrderService::useCoupon($memberId, $goodsIds, $good, $goodsCount, $coupon, $payAmount, $totalAmount);
|
|
|
}
|
|
|
|
|
|
Redis::del("ORDER:USE:COUPON:" . $memberId);
|