Tokumeikoi 5 years ago
parent
commit
8986ba1d42

+ 7 - 4
app/Console/Commands/CheckOrder.php

@@ -73,16 +73,19 @@ class CheckOrder extends Command
     private function buyByCycle(Order $order, User $user, Plan $plan)
     {
         // change plan process
-        if ($order->type == 3) {
+        if ((int)$order->type === 3) {
             $user->expired_at = time();
         }
         if ($order->refund_amount) {
             $user->balance = $user->balance + $order->refund_amount;
         }
         $user->transfer_enable = $plan->transfer_enable * 1073741824;
-        if ((int)config('v2board.renew_reset_traffic_enable', 1)) {
-            $user->u = 0;
-            $user->d = 0;
+        // change plan not reset traffic
+        if (!(int)$order->type === 3) {
+            if ((int)config('v2board.renew_reset_traffic_enable', 1)) {
+                $user->u = 0;
+                $user->d = 0;
+            }
         }
         $user->plan_id = $plan->id;
         $user->group_id = $plan->group_id;

+ 1 - 1
resources/views/mail/sendEmailVerify.blade.php

@@ -72,7 +72,7 @@
                                             <tbody>
                                             <tr>
                                                 <td style="font:14px/19px Open Sans, Arial, Verdana, sans-serif; color:#5c5c5c; font-weight:300; padding:0 0 19px;">
-                                                    感谢您使用「{{$name}}」,请在 1 分钟内填写验证码完成验证操作。<br><br>
+                                                    感谢您使用「{{$name}}」,请在 5 分钟内填写验证码完成验证操作。<br><br>
                                                     <p style="text-align:center">
                                                                                                             <span
                                                                                                                 style="font-size:48px">