root 5 years ago
parent
commit
1cd0dbdd31
2 changed files with 6 additions and 1 deletions
  1. 5 0
      app/Console/Commands/CheckOrder.php
  2. 1 1
      app/Http/Controllers/OrderController.php

+ 5 - 0
app/Console/Commands/CheckOrder.php

@@ -67,6 +67,11 @@ class CheckOrder extends Command
     
     private function buy ($order, $user) {
         $plan = Plan::find($order->plan_id);
+        // change plan process
+        if ($order->type === 3) {
+            $transferEnableDifference = $plan->transfer_enable - ($user->transfer_enable / 1073741824);
+            $user->expired_at = $user->expired_at - ($transferEnableDifference * 1 * 60);
+        }
         $user->transfer_enable = $plan->transfer_enable * 1073741824;
         $user->enable = 1;
         $user->plan_id = $plan->id;

+ 1 - 1
app/Http/Controllers/OrderController.php

@@ -115,7 +115,7 @@ class OrderController extends Controller
         if ($user->expired_at > time() && $order->plan_id !== $user->plan_id) {
             $order->type = 3;
             if (!(int)config('v2board.plan_is_update', 1)) abort(500, '目前不允许更改订阅,请联系管理员');
-            $order->total_amount = $order->total_amount + (ceil(($user->expired_at - time()) / 86400) * config('v2board.plan_update_fee', 0.5) * 100);
+            // $order->total_amount = $order->total_amount + (ceil(($user->expired_at - time()) / 86400) * config('v2board.plan_update_fee', 0.5) * 100);
         } else if ($user->expired_at > time() && $order->plan_id == $user->plan_id) {
             $order->type = 2;
         } else {