feat: 修改UserController和OrderLogic类以优化用户订单处理逻辑
This commit is contained in:
parent
21e888afe4
commit
64d978358a
@ -232,8 +232,8 @@ class UserController extends BaseApiController
|
||||
$params['page_size'] = $page_size > 0 ? $page_size : 15;
|
||||
$res = UserLogic::dealDetails($params,$this->userId);
|
||||
$integral = User::where('id',$this->userId)->value('integral');
|
||||
$number = UserSign::where('id',$this->userId)->where('status',0)->sum('number');
|
||||
$GetNumber = UserSign::where('id',$this->userId)->where('status',1)->sum('number');
|
||||
$number = 0;//UserSign::where('id',$this->userId)->where('status',0)->sum('number');
|
||||
$GetNumber = 0;//UserSign::where('id',$this->userId)->where('status',1)->sum('number');
|
||||
$res['page_no'] = $params['page_no'];
|
||||
$res['page_size'] = $params['page_size'];
|
||||
$res['extend'] = [
|
||||
|
@ -83,9 +83,10 @@ class OrderLogic extends BaseLogic
|
||||
foreach ($cart_select as $k => $v) {
|
||||
$find = StoreBranchProduct::where(['product_id' => $v['product_id'], 'store_id' => $params['store_id']])->field($field)->withTrashed()->find();
|
||||
if (!$find) {
|
||||
unset($cart_select[$k]);
|
||||
continue;
|
||||
}
|
||||
unset($cart_select[$k]['id']);
|
||||
// unset($cart_select[$k]['id']);
|
||||
$cart_select[$k]['total_price'] = bcmul($v['cart_num'], $find['price'], 2); //订单总价
|
||||
if ($off_activity == 1) {
|
||||
$price = $find['cost'];
|
||||
@ -210,6 +211,7 @@ class OrderLogic extends BaseLogic
|
||||
if (!$orderInfo) {
|
||||
return false;
|
||||
}
|
||||
d($orderInfo);
|
||||
$uid = $user['id'] ?? 0;
|
||||
$_order = $orderInfo['order'];
|
||||
$_order['uid'] = $uid;
|
||||
|
Loading…
x
Reference in New Issue
Block a user