From cc6342b1505845c254782471aae8b70d7ec3d5d4 Mon Sep 17 00:00:00 2001 From: wuhui_zzw <1760308791@qq.com> Date: Wed, 3 Apr 2024 16:56:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E4=B8=AA=E4=BA=BA?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E6=95=B0=E6=8D=AE=20=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=BC=98=E5=8C=96(=E9=A2=9D=E5=BA=A6?= =?UTF-8?q?=E5=8C=85=E5=90=AB=E5=86=BB=E7=BB=93=E4=B8=AD=E9=A2=9D=E5=BA=A6?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controller/api/Auth.php | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/app/controller/api/Auth.php b/app/controller/api/Auth.php index 2beddf0..20cd090 100644 --- a/app/controller/api/Auth.php +++ b/app/controller/api/Auth.php @@ -173,21 +173,19 @@ class Auth extends BaseController // 用户是否存在代理身份 $agentCount = app()->make(AgentRepository::class)->getSearchModel(['uid'=>$user->uid])->count(); $data['is_agent'] = $agentCount > 0; - // 用户持有可用酒卡额度 + // 用户持有全部额度（冻结中 + 可用额度） $data['available'] = (float)app()->make(ExchangeQuotaRepository::class) ->searchModel(['uid'=>$user->uid]) - ->value('(surplus_quota - freeze_quota)'); + ->value('surplus_quota'); $data['vegetable_available'] = (float)app()->make(ExchangeQuotaRepository::class) ->searchModel(['uid'=>$user->uid,'quota_type'=>2]) - ->value('(surplus_quota - freeze_quota)'); - + ->value('surplus_quota'); $data['wine_available'] = (float)app()->make(ExchangeQuotaRepository::class) ->searchModel(['uid'=>$user->uid,'quota_type'=>3]) - ->value('(surplus_quota - freeze_quota)'); - + ->value('surplus_quota'); $data['oil_available'] = (float)app()->make(ExchangeQuotaRepository::class) ->searchModel(['uid'=>$user->uid,'quota_type'=>4]) - ->value('(surplus_quota - freeze_quota)'); + ->value('surplus_quota'); return app('json')->success($data); }