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

Merge pull request '713' (#37) from 713 into dev

Browse Source 
Reviewed-on: #37
This commit is contained in:
mkm 2024-07-13 09:36:43 +08:00
commit 0942299f55
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -108,7 +108,7 @@ class OrderLogic extends BaseLogic
}
unset($cart_select[$k]['id']);
$cart_select[$k]['total_price'] = bcmul($v['cart_num'], $find['price'], 2); //订单总价
if ($off_activity == 1 || in_array($user['user_ship'], [4, 5, 6, 7])) {
if ($off_activity == 1 || ($user!=null &&in_array($user['user_ship'], [4, 5, 6, 7]))) {
$price = $find['cost'];
} else {
$price = $find['price'];