diff --git a/app/Console/Commands/AutoJob.php b/app/Console/Commands/AutoJob.php index 9862daaa..eaca9d41 100644 --- a/app/Console/Commands/AutoJob.php +++ b/app/Console/Commands/AutoJob.php @@ -138,12 +138,19 @@ class AutoJob extends Command // 封禁账号 private function blockUsers(): void { + // 禁用流量超限用户 + foreach (User::activeUser()->whereRaw("u + d >= transfer_enable")->get() as $user) { + $user->update(['enable' => 0]); + + // 写入日志 + $this->addUserBanLog($user->id, 0, '【封禁代理】-流量已用完'); + } + // 封禁1小时内流量异常账号 - $userList = User::activeUser()->whereBanTime(null); if (sysConfig('is_traffic_ban')) { $trafficBanValue = sysConfig('traffic_ban_value'); $trafficBanTime = sysConfig('traffic_ban_time'); - foreach ($userList->get() as $user) { + foreach (User::activeUser()->whereBanTime(null)->get() as $user) { // 对管理员豁免 if ($user->is_admin) { continue; @@ -162,14 +169,6 @@ class AutoJob extends Command } } } - - // 禁用流量超限用户 - foreach ($userList->whereRaw("u + d >= transfer_enable")->get() as $user) { - $user->update(['enable' => 0]); - - // 写入日志 - $this->addUserBanLog($user->id, 0, '【封禁代理】-流量已用完'); - } } // 解封被临时封禁的账号 diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php index 6173d2a8..de484fdb 100644 --- a/app/Http/Controllers/AdminController.php +++ b/app/Http/Controllers/AdminController.php @@ -42,6 +42,7 @@ class AdminController extends Controller $view['expireDays'] = sysConfig('expire_days'); $view['totalUserCount'] = User::count(); // 总用户数 + $view['todayRegister'] = User::whereDate('created_at', date('Y-m-d'))->count();// 今日注册用户 $view['enableUserCount'] = User::whereEnable(1)->count(); // 有效用户数 $view['activeUserCount'] = User::where('t', '>=', $past)->count(); // 活跃用户数 $view['unActiveUserCount'] = User::whereEnable(1)->whereBetween('t', [1, $past,])->count(); // 不活跃用户数 @@ -49,21 +50,22 @@ class AdminController extends Controller $view['expireWarningUserCount'] = User::whereBetween('expired_at', [date('Y-m-d'), date('Y-m-d', strtotime("+".sysConfig('expire_days')." days"))])->count(); // 临近过期用户数 $view['largeTrafficUserCount'] = User::whereRaw('(u + d) >= 107374182400')->where('status', '<>', -1)->count(); // 流量超过100G的用户 - $view['flowAbnormalUserCount'] = count((new UserHourlyDataFlow)->trafficAbnormal());// 1小时内流量异常用户 $view['nodeCount'] = Node::count(); $view['unnormalNodeCount'] = Node::whereStatus(0)->count(); $view['flowCount'] = flowAutoShow(NodeDailyDataFlow::where('created_at', '>=', date('Y-m-d', strtotime("-30 days")))->sum('total')); + $view['todayFlowCount'] = flowAutoShow(NodeDailyDataFlow::where('created_at', '>=', date('Y-m-d'))->sum('total')); $view['totalFlowCount'] = flowAutoShow(NodeDailyDataFlow::sum('total')); $view['totalCredit'] = User::where('credit', '<>', 0)->sum('credit') / 100; $view['totalWaitRefAmount'] = ReferralLog::whereIn('status', [0, 1])->sum('commission') / 100; + $view['todayWaitRefAmount'] = ReferralLog::whereIn('status', [0, 1])->whereDate('created_at', date('Y-m-d'))->sum('commission') / 100; $view['totalRefAmount'] = ReferralApply::whereStatus(2)->sum('amount') / 100; $view['totalOrder'] = Order::count(); + $view['todayOrder'] = Order::whereDate('created_at', date('Y-m-d'))->count(); $view['totalOnlinePayOrder'] = Order::where('pay_type', '<>', 0)->count(); + $view['todayOnlinePayOrder'] = Order::where('pay_type', '<>', 0)->whereDate('created_at', date('Y-m-d'))->count(); $view['totalSuccessOrder'] = Order::whereStatus(2)->count(); $view['todaySuccessOrder'] = Order::whereStatus(2)->whereDate('created_at', date('Y-m-d'))->count(); - // 今日 - $view['todayRegister'] = User::whereDate('created_at', date('Y-m-d'))->count(); return view('admin.index', $view); } diff --git a/resources/views/admin/index.blade.php b/resources/views/admin/index.blade.php index 1a306608..fa0c2d2e 100644 --- a/resources/views/admin/index.blade.php +++ b/resources/views/admin/index.blade.php @@ -14,6 +14,11 @@ 总用户
{{$totalUserCount}} + @if ($todayRegister) + + {{$todayRegister}} + + @endif
@@ -157,6 +162,11 @@ 30日内消耗流量
{{$flowCount}} + @if($todayFlowCount !== '0B') + + {{$todayFlowCount}} + + @endif
@@ -170,6 +180,11 @@ 总订单数
{{$totalOrder}} + @if($todayOrder) + + {{$todayOrder}} + + @endif
@@ -183,6 +198,11 @@ 在线支付订单数
{{$totalOnlinePayOrder}} + @if($todayOnlinePayOrder) + + {{$todayOnlinePayOrder}} + + @endif
@@ -196,20 +216,11 @@ 支付成功订单数
{{$totalSuccessOrder}} -
- - - -
- -
- - 今天成功订单数 -
- {{$todaySuccessOrder}} + @if($todaySuccessOrder) + + {{$todaySuccessOrder}} + + @endif
@@ -236,6 +247,11 @@ 待提现佣金
{{$totalWaitRefAmount}} + @if($todayWaitRefAmount) + + {{$todayWaitRefAmount}} + + @endif
diff --git a/resources/views/admin/layouts.blade.php b/resources/views/admin/layouts.blade.php index 94e9f383..99c4c7fc 100644 --- a/resources/views/admin/layouts.blade.php +++ b/resources/views/admin/layouts.blade.php @@ -141,13 +141,16 @@ + @php + $openTicket = \App\Models\Ticket::whereStatus(0)->count() + @endphp
  • 客服系统 - @if(\App\Models\Ticket::whereStatus(0)->count() > 0 ) + @if($openTicket > 0)
    - {{\App\Models\Ticket::whereStatus(0)->count()}} + {{$openTicket}}
    @endif     @@ -155,9 +158,9 @@
  • 服务工单 - @if(\App\Models\Ticket::whereStatus(0)->count() > 0 ) + @if($openTicket > 0)
    - {{\App\Models\Ticket::whereStatus(0)->count()}} + {{$openTicket}}
    @endif     @@ -253,13 +256,16 @@
    • + @php + $openApply = \App\Models\ReferralApply::whereStatus(0)->count() + @endphp
  • 推广系统 - @if(\App\Models\ReferralApply::whereStatus(0)->count() > 0 ) + @if($openApply > 0)
    - {{\App\Models\ReferralApply::whereStatus(0)->count()}} + {{$openApply}}
    @endif     @@ -272,9 +278,9 @@
  • 提现管理 - @if(\App\Models\ReferralApply::whereStatus(0)->count() > 0 ) + @if($openApply > 0)
    - {{\App\Models\ReferralApply::whereStatus(0)->count()}} + {{$openApply}}
    @endif