diff --git a/app/api/controller/user/UserController.php b/app/api/controller/user/UserController.php index 12a550175..301a16a8d 100644 --- a/app/api/controller/user/UserController.php +++ b/app/api/controller/user/UserController.php @@ -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'] = [ diff --git a/app/api/logic/order/OrderLogic.php b/app/api/logic/order/OrderLogic.php index bb31af72d..1ca3ab514 100644 --- a/app/api/logic/order/OrderLogic.php +++ b/app/api/logic/order/OrderLogic.php @@ -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;