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

Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev

Browse Source
This commit is contained in:
mkm 2024-06-21 17:28:12 +08:00
commit 3c0848a4e4
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/api/logic/order/OrderLogic.php
View File

@ -129,11 +129,14 @@ class OrderLogic extends BaseLogic
self::$store_price = bcadd(self::$store_price, $cart_select[$k]['store_price'], 2);//门店零售价格 self::$store_price = bcadd(self::$store_price, $cart_select[$k]['store_price'], 2);//门店零售价格
// self::$profit = bcadd(self::$profit, $cart_select[$k]['profit'], 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; $pay_price = self::$pay_price;
}else{ }else{
$pay_price =bcsub(self::$pay_price, self::$activity_price, 2); //减去活动优惠金额 $pay_price =bcsub(self::$pay_price, self::$activity_price, 2); //减去活动优惠金额
} }
if($pay_price < 500){ if($pay_price < 500){
throw new Exception('金额低于500'); throw new Exception('金额低于500');
} }

2
app/common/logic/PayNotifyLogic.php
View File

@ -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']); $vipFrozenAmount = self::dealFrozenPrice($order['id']);
//为1的时候要去减活动价 //为1的时候要去减活动价
// $final_price = bcsub($order['pay_price'],$order['deduction_price'],2); // $final_price = bcsub($order['pay_price'],$order['deduction_price'],2);