From fe0332a9f94c3183252c596dc3f0b866d8c43293 Mon Sep 17 00:00:00 2001
From: Tokumeikoi <tokumeikoi@protonmail.com>
Date: Fri, 11 Sep 2020 01:02:31 +0800
Subject: [PATCH] optimization: code

---
 app/Console/Commands/CheckOrder.php | 16 +++++++---------
 app/Services/OrderService.php       |  4 ++--
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/app/Console/Commands/CheckOrder.php b/app/Console/Commands/CheckOrder.php
index 75981750..288bf6ff 100755
--- a/app/Console/Commands/CheckOrder.php
+++ b/app/Console/Commands/CheckOrder.php
@@ -7,8 +7,6 @@ use Illuminate\Console\Command;
 use App\Models\Order;
 use App\Models\User;
 use App\Models\Plan;
-use App\Utils\Helper;
-use App\Models\Coupon;
 use Illuminate\Support\Facades\DB;
 
 class CheckOrder extends Command
@@ -83,10 +81,10 @@ class CheckOrder extends Command
         }
         switch ((string)$order->cycle) {
             case 'onetime_price':
-                $this->buyByOneTime($order, $user, $plan);
+                $this->buyByOneTime($user, $plan);
                 break;
             case 'reset_price':
-                $this->buyReset($user);
+                $this->buyByResetTraffic($user);
                 break;
             default:
                 $this->buyByCycle($order, $user, $plan);
@@ -104,7 +102,7 @@ class CheckOrder extends Command
         DB::commit();
     }
 
-    private function buyReset(User $user)
+    private function buyByResetTraffic(User $user)
     {
         $user->u = 0;
         $user->d = 0;
@@ -119,17 +117,17 @@ class CheckOrder extends Command
         $user->transfer_enable = $plan->transfer_enable * 1073741824;
 
         // 续费重置&类型=续费
-        if ((int)config('v2board.renew_reset_traffic_enable', 1) && $order->type === 2) $this->buyReset($user);
+        if ((int)config('v2board.renew_reset_traffic_enable', 1) && $order->type === 2) $this->buyByResetTraffic($user);
         // 购买前用户过期为NULL（一次性）
-        if ($user->expired_at === NULL) $this->buyReset($user);
+        if ($user->expired_at === NULL) $this->buyByResetTraffic($user);
         // 新购
-        if ($order->type === 1) $this->buyReset($user);
+        if ($order->type === 1) $this->buyByResetTraffic($user);
         $user->plan_id = $plan->id;
         $user->group_id = $plan->group_id;
         $user->expired_at = $this->getTime($order->cycle, $user->expired_at);
     }
 
-    private function buyByOneTime(Order $order, User $user, Plan $plan)
+    private function buyByOneTime(User $user, Plan $plan)
     {
         $user->transfer_enable = $plan->transfer_enable * 1073741824;
         $user->u = 0;
diff --git a/app/Services/OrderService.php b/app/Services/OrderService.php
index 6081acf8..acd16df2 100644
--- a/app/Services/OrderService.php
+++ b/app/Services/OrderService.php
@@ -106,8 +106,8 @@ class OrderService
         if ($user->discount && $trafficUnitPrice) {
             $trafficUnitPrice = $trafficUnitPrice - ($trafficUnitPrice * $user->discount / 100);
         }
-        $notUsedTrafficPrice = $plan->transfer_enable - (($user->u + $user->d) / 1073741824);
-        $result = $trafficUnitPrice * $notUsedTrafficPrice;
+        $notUsedTraffic = $plan->transfer_enable - (($user->u + $user->d) / 1073741824);
+        $result = $trafficUnitPrice * $notUsedTraffic;
         $orderModel = Order::where('user_id', $user->id)->where('cycle', '!=', 'reset_price')->where('status', 3);
         $order->surplus_amount = $result > 0 ? $result : 0;
         $order->surplus_order_ids = json_encode(array_column($orderModel->get()->toArray(), 'id'));