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

feat: 修改UserController和OrderLogic类以优化用户订单处理逻辑

Browse Source
This commit is contained in:
mkm 2024-07-01 15:46:55 +08:00
parent 21e888afe4
commit 64d978358a
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/api/controller/user/UserController.php
View File

@ -232,8 +232,8 @@ class UserController extends BaseApiController
$params['page_size'] = $page_size > 0 ? $page_size : 15; $params['page_size'] = $page_size > 0 ? $page_size : 15;
$res = UserLogic::dealDetails($params,$this->userId); $res = UserLogic::dealDetails($params,$this->userId);
$integral = User::where('id',$this->userId)->value('integral'); $integral = User::where('id',$this->userId)->value('integral');
$number = UserSign::where('id',$this->userId)->where('status',0)->sum('number'); $number = 0;//UserSign::where('id',$this->userId)->where('status',0)->sum('number');
$GetNumber = UserSign::where('id',$this->userId)->where('status',1)->sum('number'); $GetNumber = 0;//UserSign::where('id',$this->userId)->where('status',1)->sum('number');
$res['page_no'] = $params['page_no']; $res['page_no'] = $params['page_no'];
$res['page_size'] = $params['page_size']; $res['page_size'] = $params['page_size'];
$res['extend'] = [ $res['extend'] = [

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

@ -83,9 +83,10 @@ class OrderLogic extends BaseLogic
foreach ($cart_select as $k => $v) { foreach ($cart_select as $k => $v) {
$find = StoreBranchProduct::where(['product_id' => $v['product_id'], 'store_id' => $params['store_id']])->field($field)->withTrashed()->find(); $find = StoreBranchProduct::where(['product_id' => $v['product_id'], 'store_id' => $params['store_id']])->field($field)->withTrashed()->find();
if (!$find) { if (!$find) {
unset($cart_select[$k]);
continue; continue;
} }
unset($cart_select[$k]['id']); // unset($cart_select[$k]['id']);
$cart_select[$k]['total_price'] = bcmul($v['cart_num'], $find['price'], 2); //订单总价 $cart_select[$k]['total_price'] = bcmul($v['cart_num'], $find['price'], 2); //订单总价
if ($off_activity == 1) { if ($off_activity == 1) {
$price = $find['cost']; $price = $find['cost'];
@ -210,6 +211,7 @@ class OrderLogic extends BaseLogic
if (!$orderInfo) { if (!$orderInfo) {
return false; return false;
} }
d($orderInfo);
$uid = $user['id'] ?? 0; $uid = $user['id'] ?? 0;
$_order = $orderInfo['order']; $_order = $orderInfo['order'];
$_order['uid'] = $uid; $_order['uid'] = $uid;