This commit is contained in:
root 2019-12-30 16:57:21 +08:00
parent a9abdcd9d3
commit ff6aeb92ec

View File

@ -48,8 +48,7 @@ class SendRemindMail extends Command
} }
private function remindExpire ($user) { private function remindExpire ($user) {
if ($user->expired_at > time()) return; if (($user->expired_at - 86400) < time() && $user->expired_at > time()) {
if ($user->expired_at - 86400 > time()) return;
SendEmail::dispatch([ SendEmail::dispatch([
'email' => $user->email, 'email' => $user->email,
'subject' => '在' . config('v2board.app_name', 'V2board') . '的服务即将到期', 'subject' => '在' . config('v2board.app_name', 'V2board') . '的服务即将到期',
@ -59,9 +58,10 @@ class SendRemindMail extends Command
] ]
]); ]);
} }
}
private function remindTraffic ($user) { private function remindTraffic ($user) {
if (!$this->remindTrafficIsWarnValue(($user->u + $user->d), $user->transfer_enable)) return; if ($this->remindTrafficIsWarnValue(($user->u + $user->d), $user->transfer_enable)) {
$sendCount = MailLog::where('created_at', '>=', strtotime(date('Y-m-1'))) $sendCount = MailLog::where('created_at', '>=', strtotime(date('Y-m-1')))
->where('template_name', 'mail.sendRemindTraffic') ->where('template_name', 'mail.sendRemindTraffic')
->count(); ->count();
@ -75,6 +75,7 @@ class SendRemindMail extends Command
] ]
]); ]);
} }
}
private function remindTrafficIsWarnValue ($ud, $transfer_enable) { private function remindTrafficIsWarnValue ($ud, $transfer_enable) {
if ($ud <= 0) return false; if ($ud <= 0) return false;