Tokumeikoi 4 years ago
parent
commit
c29bd836eb
2 changed files with 12 additions and 3 deletions
  1. 11 1
      app/Http/Controllers/Admin/OrderController.php
  2. 1 2
      app/Services/OrderService.php

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

@@ -126,7 +126,17 @@ class OrderController extends Controller
         $order->trade_no = Helper::guid();
         $order->total_amount = $request->input('total_amount');
 
-        $orderService->setOrderType($user);
+        $order = $this->order;
+        if ($order->cycle === 'reset_price') {
+            $order->type = 4;
+        } else if ($user->plan_id !== NULL && $order->plan_id !== $user->plan_id) {
+            $order->type = 3;
+        } else if ($user->expired_at > time() && $order->plan_id == $user->plan_id) {
+            $order->type = 2;
+        } else {
+            $order->type = 1;
+        }
+
         $orderService->setInvite($user);
 
         if (!$order->save()) {

+ 1 - 2
app/Services/OrderService.php

@@ -46,8 +46,7 @@ class OrderService
         $order = $this->order;
         if ($order->cycle === 'reset_price') {
             $order->type = 4;
-        }
-        if ($user->plan_id !== NULL && $order->plan_id !== $user->plan_id) {
+        } else if ($user->plan_id !== NULL && $order->plan_id !== $user->plan_id) {
             if (!(int)config('v2board.plan_change_enable', 1)) abort(500, '目前不允许更改订阅,请联系客服或提交工单操作');
             $order->type = 3;
             $this->getSurplusValue($user, $order);