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-21 17:24:04 +08:00
commit d605bf2627
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -638,6 +638,9 @@ class StoreOrderCreateRepository extends StoreOrderRepository
$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; $is_self_pickup = true;
if($order_type=='balance' &&$source!=103){
throw new ValidateException('余额支付只能用于里海云仓');
}
return compact( return compact(
'is_self_pickup', 'is_self_pickup',
'order_type', 'order_type',
@ -935,7 +938,7 @@ class StoreOrderCreateRepository extends StoreOrderRepository
//创建订单 //创建订单
$groupOrder = $storeGroupOrderRepository->create($groupOrder); $groupOrder = $storeGroupOrderRepository->create($groupOrder);
$bills = []; $bills = [];
$consumptionDetails=[];
if ($groupOrder['integral'] > 0) { if ($groupOrder['integral'] > 0) {
$user->integral = bcsub($user->integral, $groupOrder['integral'], 0); $user->integral = bcsub($user->integral, $groupOrder['integral'], 0);
app()->make(UserBillRepository::class)->decBill($user['uid'], 'integral', 'deduction', [ app()->make(UserBillRepository::class)->decBill($user['uid'], 'integral', 'deduction', [