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

修改用户合并

Browse Source
This commit is contained in:
luofei 2024-03-13 10:41:39 +08:00 committed by mkm
parent 6f6d1d7eae
commit 25fc0e598a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/common/middleware/UserTokenMiddleware.php
View File

@ -63,7 +63,7 @@ class UserTokenMiddleware extends BaseMiddleware
if (!$user['status']) if (!$user['status'])
throw new AuthException('用户已被禁用'); throw new AuthException('用户已被禁用');
if ($user['status'] == -1) if ($user['status'] == -1)
throw new AuthException('用户已被禁用'); throw new AuthException('当前账号已合并，请重新登录');
if ($user['cancel_time']) if ($user['cancel_time'])
throw new AuthException('用户不存在'); throw new AuthException('用户不存在');

4
app/controller/api/Auth.php
View File

@ -1722,13 +1722,13 @@ class Auth extends BaseController
$orders = StoreOrder::with(['refundOrder' => function(Query $query) { $orders = StoreOrder::with(['refundOrder' => function(Query $query) {
$query->where('status', '<>', -1)->field('order_id,refund_price'); $query->where('status', '<>', -1)->field('order_id,refund_price');
}])->where('uid', $user['uid']) }])->where('uid', $user['uid'])
->whereIn('status', [0, 1, 2, 3, 9, 10]) ->whereIn('status', [2, 3])
->field('order_id,uid,total_price') ->field('order_id,uid,total_price')
->select()->toArray(); ->select()->toArray();
$otherOrders = StoreOrderOther::with(['refundOrder' => function(Query $query) { $otherOrders = StoreOrderOther::with(['refundOrder' => function(Query $query) {
$query->where('status', '<>', -1)->field('order_id,refund_price'); $query->where('status', '<>', -1)->field('order_id,refund_price');
}])->where('uid', $user['uid']) }])->where('uid', $user['uid'])
->whereIn('status', [0, 1, 2, 3, 9, 10]) ->whereIn('status', [2, 3])
->field('order_id,uid,total_price') ->field('order_id,uid,total_price')
->select()->toArray(); ->select()->toArray();
$purchaseAmount = 0; $purchaseAmount = 0;