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

Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-php into dev

Browse Source
This commit is contained in:
luofei 2024-01-18 15:48:24 +08:00
commit aa3e1f316e
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -494,9 +494,9 @@ class StoreOrderCreateRepository extends StoreOrderRepository
'is_fail' => 0 'is_fail' => 0
]; ];
$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')
->filed('uid,coupon_title,coupon_price') ->field('uid,coupon_title,coupon_price')
->select(); ->select();
if($platformConsumption){ if(count($platformConsumption)>1){
$consumption=$platformConsumption[0]; $consumption=$platformConsumption[0];
} }
} }
@ -602,7 +602,9 @@ class StoreOrderCreateRepository extends StoreOrderRepository
$total_price = $order_total_price; $total_price = $order_total_price;
$openIntegral = $merIntegralFlag && !$order_type && $sysIntegralConfig['integral_status'] && $sysIntegralConfig['integral_money'] > 0; $openIntegral = $merIntegralFlag && !$order_type && $sysIntegralConfig['integral_status'] && $sysIntegralConfig['integral_money'] > 0;
$total_coupon = bcadd($order_svip_discount, bcadd(bcadd($total_platform_coupon_price, $order_coupon_price, 2), $order_total_integral_price, 2), 2); $total_coupon = bcadd($order_svip_discount, bcadd(bcadd($total_platform_coupon_price, $order_coupon_price, 2), $order_total_integral_price, 2), 2);
$is_self_pickup=true;
return compact( return compact(
'is_self_pickup',
'order_type', 'order_type',
'source', 'source',
'order_model', 'order_model',