Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
This commit is contained in:
commit
3c0848a4e4
@ -129,11 +129,14 @@ class OrderLogic extends BaseLogic
|
||||
self::$store_price = bcadd(self::$store_price, $cart_select[$k]['store_price'], 2);//门店零售价格
|
||||
// self::$profit = bcadd(self::$profit, $cart_select[$k]['profit'], 2);
|
||||
}
|
||||
if ($user && $user['user_ship'] == 1) {
|
||||
//加支付方式限制
|
||||
$pay_type = isset($params['pay_type'])?$params['pay_type']:0;
|
||||
if ($user && $user['user_ship'] == 1 && $pay_type !=17) {
|
||||
$pay_price = self::$pay_price;
|
||||
}else{
|
||||
$pay_price =bcsub(self::$pay_price, self::$activity_price, 2); //减去活动优惠金额
|
||||
}
|
||||
|
||||
if($pay_price < 500){
|
||||
throw new Exception('金额低于500');
|
||||
}
|
||||
|
@ -355,7 +355,7 @@ class PayNotifyLogic extends BaseLogic
|
||||
}
|
||||
}
|
||||
}
|
||||
elseif ($user['user_ship'] == 1){
|
||||
elseif ($user['user_ship'] == 1 && $order['pay_type'] != PayEnum::CASH_PAY){
|
||||
$vipFrozenAmount = self::dealFrozenPrice($order['id']);
|
||||
//为1的时候要去减活动价
|
||||
// $final_price = bcsub($order['pay_price'],$order['deduction_price'],2);
|
||||
|
Loading…
x
Reference in New Issue
Block a user