瀏覽代碼

Extract ActivePaying function to UserService

兔姬桑 2 年之前
父節點
當前提交
e4857407ba
共有 3 個文件被更改,包括 8 次插入6 次删除
  1. 3 1
      app/Http/Controllers/UserController.php
  2. 0 5
      app/Models/User.php
  3. 5 0
      app/Services/UserService.php

+ 3 - 1
app/Http/Controllers/UserController.php

@@ -17,6 +17,7 @@ use App\Notifications\TicketCreated;
 use App\Notifications\TicketReplied;
 use App\Services\CouponService;
 use App\Services\ProxyService;
+use App\Services\UserService;
 use Cache;
 use DB;
 use Exception;
@@ -43,6 +44,7 @@ class UserController extends Controller
             auth()->loginUsingId(Session::get('user'));
             Session::forget('user');
         }
+        $userService = UserService::getInstance();
         $user = auth()->user();
         $totalTransfer = $user->transfer_enable;
         $usedTransfer = $user->used_traffic;
@@ -69,7 +71,7 @@ class UserController extends Controller
             'unusedPercent'    => $totalTransfer > 0 ? round($unusedTraffic / $totalTransfer, 2) * 100 : 0,
             'announcements'    => Article::type(2)->latest()->simplePaginate(1), // 公告
             'isTrafficWarning' => $user->isTrafficWarning(), // 流量异常判断
-            'paying_user'      => $user->activePayingUser(), // 付费用户判断
+            'paying_user'      => $userService->isActivePaying(), // 付费用户判断
             'userLoginLog'     => $user->loginLogs()->latest()->first(), // 近期登录日志
             'subscribe_status' => $user->subscribe->status,
             'subType'          => $subType,

+ 0 - 5
app/Models/User.php

@@ -303,11 +303,6 @@ class User extends Authenticatable
         return UserHourlyDataFlow::userRecentUsed($this->id)->sum('total');
     }
 
-    public function activePayingUser()
-    { //付费用户判断
-        return $this->orders()->active()->where('origin_amount', '>', 0)->exists();
-    }
-
     public function orders(): HasMany
     {
         return $this->hasMany(Order::class);

+ 5 - 0
app/Services/UserService.php

@@ -59,4 +59,9 @@ class UserService extends BaseService
 
         return $isCode ? $aff : sysConfig('website_url').route('register', ['aff' => 1], false);
     }
+
+    public function isActivePaying(): bool
+    {
+        return self::$user->orders()->active()->where('origin_amount', '>', 0)->exists();
+    }
 }