root 5 years ago
parent
commit
157a97b35d

+ 6 - 6
app/Console/Commands/CheckExpire.php

@@ -39,14 +39,14 @@ class CheckExpire extends Command
      */
     public function handle()
     {
-        $user = User::all();
-        foreach ($user as $item) {
-            if ($item->expired_at < time() || $item->u + $item->d >= $item->transfer_enable) {
-                $item->enable = 0;
+        $users = User::all();
+        foreach ($users as $user) {
+            if ($user->expired_at < time() || $user->u + $user->d >= $user->transfer_enable) {
+                $user->enable = 0;
             } else {
-                $item->enable = 1;
+                $user->enable = 1;
             }
-            $item->save();
+            $user->save();
         }
     }
     

+ 63 - 0
app/Console/Commands/SendRemindMail.php

@@ -0,0 +1,63 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+use App\Models\User;
+use App\Jobs\SendEmail;
+
+class SendRemindMail extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'send:remindMail';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = '发送提醒邮件';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        $users = User::all();
+        foreach ($users as $user) {
+            if ($user->remind_expire) {
+                $this->remindExpire($user);
+            }
+        }
+    }
+    
+    private function remindExpire ($user) {
+        if (($user->expired_at - 86400) < time() && $user->expired_at > time()) {
+            $this->dispatch(new SendEmail([
+                'email' => $user->email,
+                'subject' => '在' . config('v2board.app_name', 'V2board') . '的服务即将到期',
+                'template_name' => 'mail.sendRemindExpire',
+                'template_value' => [
+                    'name' => config('v2board.app_name', 'V2Board')
+                ]
+            ]));
+        }
+    }
+
+}

+ 3 - 3
app/Console/Kernel.php

@@ -24,17 +24,17 @@ class Kernel extends ConsoleKernel
      */
     protected function schedule(Schedule $schedule)
     {
-        // check order
+        // check
         $schedule->command('check:order')->everyMinute();
-        // check expire
         $schedule->command('check:expire')->everyMinute();
-        // check commission
         $schedule->command('check:commission')->everyMinute();
         // system cache
         $schedule->command('system:cache')->hourly();
         // reset
         $schedule->command('reset:traffic')->monthlyOn(1, '00:00');
         $schedule->command('reset:serverLog')->monthlyOn(1, '00:00');
+        // send
+        $schedule->command('send:remindMail')->dailyAt('11:30');
     }
 
     /**

File diff suppressed because it is too large
+ 36 - 0
resources/views/mail/sendRemindExpire.blade.php


Some files were not shown because too many files changed in this diff