root 5 years ago
parent
commit
82146a79b8

+ 7 - 0
app/Http/Controllers/OrderController.php

@@ -70,6 +70,13 @@ class OrderController extends Controller
         $order->cycle = $request->input('cycle');
         $order->trade_no = Helper::guid();
         $order->total_amount = $plan[$request->input('cycle')];
+        if ($user->expired_at > time() && $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;
+        }
         if ($user->invite_user_id) {
             $order->invite_user_id = $user->invite_user_id;
             $order->commission_balance = $order->total_amount * (config('v2board.invite_commission', 10) / 100);

File diff suppressed because it is too large
+ 0 - 0
public/p__admin__config__payment.async.js


File diff suppressed because it is too large
+ 0 - 0
public/p__admin__config__site.async.js


File diff suppressed because it is too large
+ 0 - 0
public/p__admin__dashboard.async.js


File diff suppressed because it is too large
+ 0 - 0
public/p__admin__order.async.js


File diff suppressed because it is too large
+ 0 - 0
public/p__admin__plan.async.js


File diff suppressed because it is too large
+ 0 - 0
public/p__admin__server.async.js


File diff suppressed because it is too large
+ 0 - 0
public/p__admin__server__group.async.js


File diff suppressed because it is too large
+ 0 - 0
public/p__admin__user.async.js


File diff suppressed because it is too large
+ 0 - 0
public/p__dashboard.async.js


File diff suppressed because it is too large
+ 0 - 0
public/p__index.async.js


File diff suppressed because it is too large
+ 0 - 0
public/p__invite.async.js


File diff suppressed because it is too large
+ 0 - 0
public/p__order.async.js


File diff suppressed because it is too large
+ 0 - 0
public/p__order__$trade_no.async.js


File diff suppressed because it is too large
+ 0 - 0
public/p__plan.async.js


File diff suppressed because it is too large
+ 0 - 0
public/p__plan__$plan_id.async.js


File diff suppressed because it is too large
+ 0 - 0
public/p__profile.async.js


File diff suppressed because it is too large
+ 0 - 0
public/p__subscribe.async.js


File diff suppressed because it is too large
+ 0 - 0
public/p__tutorial.async.js


File diff suppressed because it is too large
+ 0 - 0
public/umi.js


File diff suppressed because it is too large
+ 0 - 0
public/vendors.chunk.css


Some files were not shown because too many files changed in this diff