feat(OrderLogic): 修改订单逻辑,优化成本计算方式
This commit is contained in:
parent
0ea88df531
commit
66621b512f
@ -70,7 +70,7 @@ class OrderLogic extends BaseLogic
|
||||
self::setError('购物车为空');
|
||||
return false;
|
||||
}
|
||||
try {
|
||||
// try {
|
||||
self::$total_price = 0;
|
||||
self::$pay_price = 0;
|
||||
self::$cost = 0; //成本由采购价替代原成本为门店零售价
|
||||
@ -94,7 +94,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'];
|
||||
@ -218,10 +218,10 @@ class OrderLogic extends BaseLogic
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (\Exception $e) {
|
||||
self::setError($e->getMessage());
|
||||
return false;
|
||||
}
|
||||
// } catch (\Exception $e) {
|
||||
// self::setError($e->getMessage());
|
||||
// return false;
|
||||
// }
|
||||
return ['order' => $order, 'cart_list' => $cart_select, 'shopInfo' => $store['near_store']];
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user