diff --git a/app/Http/Controllers/Admin/OrderController.php b/app/Http/Controllers/Admin/OrderController.php index 6326beb7..1262d2bb 100644 --- a/app/Http/Controllers/Admin/OrderController.php +++ b/app/Http/Controllers/Admin/OrderController.php @@ -83,6 +83,7 @@ class OrderController extends Controller if (!$orderService->success(time())) { abort(500, '更新失败'); } + break; } case 2: { if (!$orderService->cancel()) { diff --git a/app/Services/MailService.php b/app/Services/MailService.php index 195622b1..74530a68 100644 --- a/app/Services/MailService.php +++ b/app/Services/MailService.php @@ -12,7 +12,8 @@ class MailService public function remindTraffic (User $user) { if (!$user->remind_traffic) return; - if (!$this->remindTrafficIsWarnValue(($user->u + $user->d), $user->transfer_enable)) return; + $trafficTotal = $user->u + $user->d; + if (!$this->remindTrafficIsWarnValue($user->u, $user->d, $user->transfer_enable)) return; $flag = CacheKey::get('LAST_SEND_EMAIL_REMIND_TRAFFIC', $user->id); if (Cache::get($flag)) return; if (!Cache::put($flag, 1, 24 * 3600)) return; @@ -27,8 +28,9 @@ class MailService ]); } - private function remindTrafficIsWarnValue($ud, $transfer_enable) + private function remindTrafficIsWarnValue($u, $d, $transfer_enable) { + $ud = $u + $d; if (!$ud) return false; if (!$transfer_enable) return false; $percentage = ($ud / $transfer_enable) * 100;