更新
This commit is contained in:
parent
7671aa9063
commit
91e79605b1
@ -496,9 +496,9 @@ class StoreOrderCreateRepository extends StoreOrderRepository
|
||||
$platformConsumption = Db::name('store_consumption_user')->where($ConsumptionWhere)->limit(100)->order('create_time', 'desc')
|
||||
->field('uid,coupon_title,coupon_price')
|
||||
->select();
|
||||
if(count($platformConsumption)>1){
|
||||
$consumption=$platformConsumption[0];
|
||||
}
|
||||
// if(count($platformConsumption)>1){
|
||||
// $consumption=$platformConsumption[0];
|
||||
// }
|
||||
}
|
||||
// }
|
||||
|
||||
@ -558,9 +558,9 @@ class StoreOrderCreateRepository extends StoreOrderRepository
|
||||
$pay_price = $org_price;
|
||||
}
|
||||
|
||||
if($consumption){
|
||||
$pay_price = bcsub($pay_price, $consumption['coupon_price'], 2);
|
||||
}
|
||||
// if($consumption){
|
||||
// $pay_price = bcsub($pay_price, $consumption['coupon_price'], 2);
|
||||
// }
|
||||
|
||||
$giveIntegralFlag = $sysIntegralConfig['integral_status'] && $sysIntegralConfig['integral_order_rate'] > 0;
|
||||
$total_give_integral = 0;
|
||||
@ -628,7 +628,8 @@ class StoreOrderCreateRepository extends StoreOrderRepository
|
||||
'address',
|
||||
'openIntegral',
|
||||
'useIntegral',
|
||||
'key'
|
||||
'key',
|
||||
'consumption'
|
||||
) + ['allow_address' => !$allow_no_address, 'order_delivery_status' => $orderDeliveryStatus];
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user