BitMaster/ProxyPanel
1
0
Fork 0
mirror of https://github.com/ProxyPanel/ProxyPanel.git synced 2026-04-11 15:10:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix some query condition "too simplified" or "out of date"

Browse Source
This commit is contained in:
兔姬桑
2021-07-27 21:24:17 +08:00
parent 0927cd4e1c
commit 97b7b4aaa4
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Console/Commands/AutoClearLogs.php
View File

@@ -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();

4
app/Http/Controllers/Admin/LogsController.php
View File

@@ -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');
}
});

2
app/Http/Controllers/Admin/UserController.php
View File

@@ -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);
});

2
app/Http/Controllers/AdminController.php
View File

@@ -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(), // 临近过期用户数