Browse Source

fix: more bug

Tokumeikoi 4 years ago
parent
commit
1d92d6b2f9

+ 4 - 4
app/Http/Controllers/Admin/CouponController.php

@@ -94,12 +94,12 @@ class CouponController extends Controller
     private function multiGenerate(CouponGenerate $request)
     {
         $coupons = [];
+        $coupon = $request->validated();
+        $coupon['limit_plan_ids'] = json_encode($coupon['limit_plan_ids']);
+        $coupon['created_at'] = $coupon['updated_at'] = time();
+        unset($coupon['generate_count']);
         for ($i = 0;$i < $request->input('generate_count');$i++) {
-            $coupon = $request->validated();
-            $coupon['limit_plan_ids'] = json_encode($coupon['limit_plan_ids']);
             $coupon['code'] = Helper::randomChar(8);
-            $coupon['created_at'] = $coupon['updated_at'] = time();
-            unset($coupon['generate_count']);
             array_push($coupons, $coupon);
         }
         DB::beginTransaction();

+ 2 - 1
app/Services/MailService.php

@@ -30,7 +30,8 @@ class MailService
     private function remindTrafficIsWarnValue($ud, $transfer_enable)
     {
         if ($ud <= 0) return false;
-        $percentage = $ud / $transfer_enable * 100;
+        if (!$transfer_enable) return false;
+        $percentage = ($ud / $transfer_enable) * 100;
         if ($percentage < 80) return false;
         if ($percentage >= 100) return false;
         return true;

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


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


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