mkm/shop-php
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
mkm 2024-01-20 18:01:36 +08:00
parent 7671aa9063
commit 91e79605b1
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/common/repositories/store/order/StoreOrderCreateRepository.php
View File

@ -496,9 +496,9 @@ class StoreOrderCreateRepository extends StoreOrderRepository
$platformConsumption = Db::name('store_consumption_user')->where($ConsumptionWhere)->limit(100)->order('create_time', 'desc') $platformConsumption = Db::name('store_consumption_user')->where($ConsumptionWhere)->limit(100)->order('create_time', 'desc')
->field('uid,coupon_title,coupon_price') ->field('uid,coupon_title,coupon_price')
->select(); ->select();
if(count($platformConsumption)>1){ // if(count($platformConsumption)>1){
$consumption=$platformConsumption[0]; // $consumption=$platformConsumption[0];
} // }
} }
// } // }
@ -558,9 +558,9 @@ class StoreOrderCreateRepository extends StoreOrderRepository
$pay_price = $org_price; $pay_price = $org_price;
} }
if($consumption){ // if($consumption){
$pay_price = bcsub($pay_price, $consumption['coupon_price'], 2); // $pay_price = bcsub($pay_price, $consumption['coupon_price'], 2);
} // }
$giveIntegralFlag = $sysIntegralConfig['integral_status'] && $sysIntegralConfig['integral_order_rate'] > 0; $giveIntegralFlag = $sysIntegralConfig['integral_status'] && $sysIntegralConfig['integral_order_rate'] > 0;
$total_give_integral = 0; $total_give_integral = 0;
@ -628,7 +628,8 @@ class StoreOrderCreateRepository extends StoreOrderRepository
'address', 'address',
'openIntegral', 'openIntegral',
'useIntegral', 'useIntegral',
'key' 'key',
'consumption'
) + ['allow_address' => !$allow_no_address, 'order_delivery_status' => $orderDeliveryStatus]; ) + ['allow_address' => !$allow_no_address, 'order_delivery_status' => $orderDeliveryStatus];
} }