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

Merge pull request 'dev' (#120) from dev into master

Browse Source 
Reviewed-on: #120
This commit is contained in:
mkm 2024-01-22 01:20:20 +08:00
commit 0e08f12f58
1 changed files with 1166 additions and 1166 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

@ -588,9 +588,9 @@ class StoreOrderCreateRepository extends StoreOrderRepository
$this->consumption_money = bcadd($this->consumption_money, $this->balance, 2); $this->consumption_money = bcadd($this->consumption_money, $this->balance, 2);
$this->balance=0; $this->balance=0;
} else { } else {
$this->consumption_money = $pay_price;
$this->balance = bcsub($this->balance, $pay_price, 2);
$pay_price = 0; $pay_price = 0;
$this->consumption_money = bcadd($this->consumption_money, $pay_price, 2);
$this->balance = $pay_price;
} }
} }
@ -641,7 +641,7 @@ 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 &&$createOrder==true){ if($order_type=='balance' &&$source!=103 && $createOrder==true){
throw new ValidateException('余额支付只能用于里海云仓'); throw new ValidateException('余额支付只能用于里海云仓');
} }
return compact( return compact(