From 25fc0e598aa4cf23accafce19e8e843b5b4ba4cc Mon Sep 17 00:00:00 2001 From: luofei <604446095@qq.com> Date: Wed, 13 Mar 2024 10:41:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7=E5=90=88?= =?UTF-8?q?=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/middleware/UserTokenMiddleware.php | 2 +- app/controller/api/Auth.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/common/middleware/UserTokenMiddleware.php b/app/common/middleware/UserTokenMiddleware.php index 7c1c1d96..0cb2ed42 100755 --- a/app/common/middleware/UserTokenMiddleware.php +++ b/app/common/middleware/UserTokenMiddleware.php @@ -63,7 +63,7 @@ class UserTokenMiddleware extends BaseMiddleware if (!$user['status']) throw new AuthException('用户已被禁用'); if ($user['status'] == -1) - throw new AuthException('用户已被禁用'); + throw new AuthException('当前账号已合并，请重新登录'); if ($user['cancel_time']) throw new AuthException('用户不存在'); diff --git a/app/controller/api/Auth.php b/app/controller/api/Auth.php index 0b2b9d00..be5926e3 100755 --- a/app/controller/api/Auth.php +++ b/app/controller/api/Auth.php @@ -1722,13 +1722,13 @@ class Auth extends BaseController $orders = StoreOrder::with(['refundOrder' => function(Query $query) { $query->where('status', '<>', -1)->field('order_id,refund_price'); }])->where('uid', $user['uid']) - ->whereIn('status', [0, 1, 2, 3, 9, 10]) + ->whereIn('status', [2, 3]) ->field('order_id,uid,total_price') ->select()->toArray(); $otherOrders = StoreOrderOther::with(['refundOrder' => function(Query $query) { $query->where('status', '<>', -1)->field('order_id,refund_price'); }])->where('uid', $user['uid']) - ->whereIn('status', [0, 1, 2, 3, 9, 10]) + ->whereIn('status', [2, 3]) ->field('order_id,uid,total_price') ->select()->toArray(); $purchaseAmount = 0;