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

Merge pull request '更新' (#128) from dev into master

Browse Source 
Reviewed-on: #128
This commit is contained in:
mkm 2024-01-23 12:42:51 +08:00
commit 299f7a6316
1 changed files with 3 additions and 3 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

@ -654,9 +654,6 @@ 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){
throw new ValidateException('余额支付只能用于里海云仓');
}
return compact( return compact(
'is_self_pickup', 'is_self_pickup',
'order_type', 'order_type',
@ -695,6 +692,9 @@ class StoreOrderCreateRepository extends StoreOrderRepository
$orderInfo = $this->v2CartIdByOrderInfo($user, $cartId, $takes, $useCoupon, $useIntegral, $addressId, true, $consumption_id); $orderInfo = $this->v2CartIdByOrderInfo($user, $cartId, $takes, $useCoupon, $useIntegral, $addressId, true, $consumption_id);
$order_model = $orderInfo['order_model']; $order_model = $orderInfo['order_model'];
$order_extend = $orderInfo['order_extend']; $order_extend = $orderInfo['order_extend'];
if($pay_type=='balance' && $orderInfo['source']!=103){
throw new ValidateException('余额支付只能用于里海云仓');
}
if (!$orderInfo['order_delivery_status']) { if (!$orderInfo['order_delivery_status']) {
throw new ValidateException('部分商品配送方式不一致,请单独下单'); throw new ValidateException('部分商品配送方式不一致,请单独下单');
} }