From 97b7b4aaa40533f2fee0a2068496812454e84322 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=85=94=E5=A7=AC=E6=A1=91?= Date: Tue, 27 Jul 2021 21:24:17 +0800 Subject: [PATCH] Fix some query condition "too simplified" or "out of date" --- app/Console/Commands/AutoClearLogs.php | 2 +- app/Http/Controllers/Admin/LogsController.php | 4 ++-- app/Http/Controllers/Admin/UserController.php | 2 +- app/Http/Controllers/AdminController.php | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/Console/Commands/AutoClearLogs.php b/app/Console/Commands/AutoClearLogs.php index 5d3eadad..28b59b9e 100644 --- a/app/Console/Commands/AutoClearLogs.php +++ b/app/Console/Commands/AutoClearLogs.php @@ -72,7 +72,7 @@ class AutoClearLogs extends Command UserBanedLog::where('created_at', '<=', date('Y-m-d H:i:s', strtotime(config('tasks.clean.user_baned_logs'))))->delete(); // 清除用户各节点 / 节点总计的每天流量数据日志 - UserDailyDataFlow::where('node_id', '<>') + UserDailyDataFlow::where('node_id', '<>', null) ->where('created_at', '<=', date('Y-m-d H:i:s', strtotime(config('tasks.clean.user_daily_logs_nodes')))) ->orWhere('created_at', '<=', date('Y-m-d H:i:s', strtotime(config('tasks.clean.user_daily_logs_total')))) ->delete(); diff --git a/app/Http/Controllers/Admin/LogsController.php b/app/Http/Controllers/Admin/LogsController.php index ca8e82a6..3b827aff 100644 --- a/app/Http/Controllers/Admin/LogsController.php +++ b/app/Http/Controllers/Admin/LogsController.php @@ -43,9 +43,9 @@ class LogsController extends Controller $request->whenFilled('is_coupon', function ($value) use ($query) { if ($value) { - $query->where('coupon_id', '<>'); + $query->where('coupon_id', '<>', null); } else { - $query->where('coupon_id'); + $query->where('coupon_id', 'null'); } }); diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php index 18b82fab..2716e85c 100644 --- a/app/Http/Controllers/Admin/UserController.php +++ b/app/Http/Controllers/Admin/UserController.php @@ -66,7 +66,7 @@ class UserController extends Controller // 不活跃用户 $request->whenFilled('paying', function () use ($query) { - $payingUser = Order::whereStatus(2)->where('goods_id', '<>', 0)->whereIsExpire(0)->where('amount', '>', 0)->pluck('user_id')->unique(); + $payingUser = Order::whereStatus(2)->where('goods_id', '<>', null)->whereIsExpire(0)->where('amount', '>', 0)->pluck('user_id')->unique(); $query->whereIn('id', $payingUser); }); diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php index 20c60fab..3e4c40dd 100644 --- a/app/Http/Controllers/AdminController.php +++ b/app/Http/Controllers/AdminController.php @@ -35,7 +35,7 @@ class AdminController extends Controller 'todayRegister' => User::whereDate('created_at', date('Y-m-d'))->count(), // 今日注册用户 'enableUserCount' => User::whereEnable(1)->count(), // 有效用户数 'activeUserCount' => User::where('t', '>=', $past)->count(), // 活跃用户数, - 'payingUserCount' => Order::whereStatus(2)->where('goods_id', '<>', 0)->whereIsExpire(0)->where('amount', '>', 0)->pluck('user_id')->unique()->count(), // 付费用户数 + 'payingUserCount' => Order::whereStatus(2)->where('goods_id', '<>', null)->whereIsExpire(0)->where('amount', '>', 0)->pluck('user_id')->unique()->count(), // 付费用户数 'unActiveUserCount' => User::whereEnable(1)->whereBetween('t', [1, $past])->count(), // 不活跃用户数 'onlineUserCount' => User::where('t', '>=', strtotime('-10 minutes'))->count(), // 10分钟内在线用户数 'expireWarningUserCount' => User::whereBetween('expired_at', [date('Y-m-d'), date('Y-m-d', strtotime(sysConfig('expire_days').' days'))])->count(), // 临近过期用户数