From 8a44ccb3fc99c4653daa9ea34f78514cb1bb9c77 Mon Sep 17 00:00:00 2001
From: Tokumeikoi <tokumeikoi@protonmail.com>
Date: Thu, 10 Sep 2020 13:08:12 +0800
Subject: [PATCH] fix: onetime reset package

---
 app/Http/Controllers/User/OrderController.php | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/app/Http/Controllers/User/OrderController.php b/app/Http/Controllers/User/OrderController.php
index c13dfe9b..4c471610 100755
--- a/app/Http/Controllers/User/OrderController.php
+++ b/app/Http/Controllers/User/OrderController.php
@@ -93,12 +93,9 @@ class OrderController extends Controller
             abort(500, '该订阅周期无法进行购买，请选择其他周期');
         }
 
-        if ($request->input('cycle') === 'reset_price' && !$user->plan_id) {
-            abort(500, '必须存在订阅才可以购买流量重置包');
-        }
-
-        if ($request->input('cycle') === 'reset_price' && $user->expired_at <= time()) {
-            abort(500, '当前订阅已过期，无法购买重置包');
+        if ($request->input('cycle') === 'reset_price') {
+            if (!($user->expired_at > time() || $user->expired_at === NULL) && !$user->plan_id)
+            abort(500, '当前无法购买流量重置包');
         }
 
         DB::beginTransaction();