From 561e42b61450df3bd025fee666d757c5801ba5f8 Mon Sep 17 00:00:00 2001 From: atshike Date: Sat, 4 Jan 2025 10:36:08 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E9=A6=96=E9=A1=B5=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- serve/app/Http/Controllers/Api/AuthController.php | 6 ++++-- serve/app/Http/Controllers/Install/IndexController.php | 3 ++- serve/app/Http/Resources/UserInfoResource.php | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/serve/app/Http/Controllers/Api/AuthController.php b/serve/app/Http/Controllers/Api/AuthController.php index e379a1e..aaf4bc7 100644 --- a/serve/app/Http/Controllers/Api/AuthController.php +++ b/serve/app/Http/Controllers/Api/AuthController.php @@ -136,11 +136,13 @@ class AuthController extends Controller $user = $request->user('api'); if ($user->type === UserType::MEMBER) { $user->load('vipPackage:id,name,config'); - $user->link_amount = $user->yuanma_amount = $user->dy_card_amount = 0; + $user->link_amount = $user->link_total = $user->link_created = 0; $config = $user->vipPackage['config'] ?? null; if ($config) { $link_count = Link::query()->where('user_id', $user->id)->count(); - $user->link_amount = bcsub($config['count_limit'], $link_count); + $user->link_total = (int) $config['count_limit']; + $user->link_created = $link_count; + $user->link_amount = (int) bcsub($config['count_limit'], $link_count); } } $user->login_time = $user->currentAccessToken()->created_at; diff --git a/serve/app/Http/Controllers/Install/IndexController.php b/serve/app/Http/Controllers/Install/IndexController.php index b8d5997..5ba6697 100644 --- a/serve/app/Http/Controllers/Install/IndexController.php +++ b/serve/app/Http/Controllers/Install/IndexController.php @@ -24,7 +24,8 @@ class IndexController extends Controller if (DB::table('sys_configs')->count() > 0) { return redirect('/'); } - } catch (\Exception $e) {} + } catch (\Exception $e) { + } $is_goon = true; $data = [ diff --git a/serve/app/Http/Resources/UserInfoResource.php b/serve/app/Http/Resources/UserInfoResource.php index 948a5cd..a456cc5 100644 --- a/serve/app/Http/Resources/UserInfoResource.php +++ b/serve/app/Http/Resources/UserInfoResource.php @@ -25,8 +25,8 @@ class UserInfoResource extends JsonResource $this->mergeWhen($this->type === UserType::MEMBER, [ 'vip_package' => $this->vipPackage, 'link_amount' => $this->link_amount, - 'yuanma_amount' => $this->yuanma_amount, - 'dy_card_amount' => $this->dy_card_amount, + 'link_total' => $this->link_total, + 'link_created' => $this->link_created, 'referral_code' => $this->referral_code, 'commission' => $this->commission, // 未提现佣金 'accumulate_commission' => $this->accumulate_commission, // 累计佣金