From 874648a4c021559a603fa02bb64c1d4d723a884b Mon Sep 17 00:00:00 2001
From: Tokumeikoi <tokumeikoi@protonmail.com>
Date: Mon, 17 Feb 2020 01:27:07 +0800
Subject: [PATCH] update order change process

---
 app/Console/Commands/CheckOrder.php           |  3 +++
 app/Http/Controllers/User/OrderController.php | 19 ++++++++++++-------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/app/Console/Commands/CheckOrder.php b/app/Console/Commands/CheckOrder.php
index 557e4a83..ad994109 100755
--- a/app/Console/Commands/CheckOrder.php
+++ b/app/Console/Commands/CheckOrder.php
@@ -70,6 +70,9 @@ class CheckOrder extends Command
     {
         $plan = Plan::find($order->plan_id);
         // change plan process
+        if ($order->type === 3) {
+            $user->expired_at = time();
+        }
         $user->transfer_enable = $plan->transfer_enable * 1073741824;
         $user->enable = 1;
         $user->u = 0;
diff --git a/app/Http/Controllers/User/OrderController.php b/app/Http/Controllers/User/OrderController.php
index 085d1868..9410cbb6 100755
--- a/app/Http/Controllers/User/OrderController.php
+++ b/app/Http/Controllers/User/OrderController.php
@@ -142,7 +142,11 @@ class OrderController extends Controller
             if (!(int)config('v2board.plan_change_enable', 1)) abort(500, '目前不允许更改订阅，请联系管理员');
             $order->type = 3;
             $order->surplus_amount = $this->getSurplusValue($user);
-            $order->total_amount = $order->total_amount - $order->surplus_amount;
+            if ($order->surplus_amount >= $order->total_amount) {
+                $order->total_amount = 0;
+            } else {
+                $order->total_amount = $order->total_amount - $order->surplus_amount;
+            }
         } else if ($user->expired_at > time() && $order->plan_id == $user->plan_id) {
             $order->type = 2;
         } else {
@@ -174,12 +178,6 @@ class OrderController extends Controller
         // discount complete
         $order->total_amount = $order->total_amount - $order->discount_amount;
         // discount end
-
-        // free process
-        if ($order->total_amount <= 0) {
-            $order->total_amount = 0;
-            $order->status = 1;
-        }
         // invite process
         if ($user->invite_user_id && $order->total_amount > 0) {
             $order->invite_user_id = $user->invite_user_id;
@@ -213,6 +211,13 @@ class OrderController extends Controller
         if (!$order) {
             abort(500, '订单不存在或已支付');
         }
+        // free process
+        if ($order->total_amount <= 0) {
+            $order->total_amount = 0;
+            $order->status = 1;
+            $order->save();
+            exit();
+        }
         switch ($method) {
             // return type => 0: QRCode / 1: URL
             case 0: