linwu 2 сар өмнө
parent
commit
1c96e41ae0

+ 11 - 7
app/Http/Controllers/Mobile/Lottery/LotteryController.php

@@ -148,12 +148,6 @@ class LotteryController extends MobileBaseController
         if (!empty($log)) {
         if (!empty($log)) {
             return response()->json(['status' => 0, 'msg' => '您已抽过奖!']);
             return response()->json(['status' => 0, 'msg' => '您已抽过奖!']);
         }
         }
-        LotteryLog::create([
-            'create_time' => $date,
-            'type'        => $data['type'],
-            'number'      => 1,
-            'open_id'     => $data['open_id'],
-        ]);
 
 
         //奖品列表
         //奖品列表
         $model     = new LotteryPrize();
         $model     = new LotteryPrize();
@@ -162,6 +156,17 @@ class LotteryController extends MobileBaseController
         foreach ($prize_arr as $key => $val) {
         foreach ($prize_arr as $key => $val) {
             $arr[$val['id']] = $val['prize_odds'] * 100;
             $arr[$val['id']] = $val['prize_odds'] * 100;
         }
         }
+        if (array_sum($arr) == 0) {
+            return response()->json(['status' => 0, 'msg' => '奖品已全部抽完,请联系管理员!']);
+        }
+
+        //增加抽奖记录
+        LotteryLog::create([
+            'create_time' => $date,
+            'type'        => $data['type'],
+            'number'      => 1,
+            'open_id'     => $data['open_id'],
+        ]);
         $rid = $this->_get_rand($arr); //根据概率获取奖项id
         $rid = $this->_get_rand($arr); //根据概率获取奖项id
 
 
         //增加奖品
         //增加奖品
@@ -190,7 +195,6 @@ class LotteryController extends MobileBaseController
         $result = '';
         $result = '';
         //概率数组的总概率精度
         //概率数组的总概率精度
         $proSum  = array_sum($proArr);
         $proSum  = array_sum($proArr);
-        $randNum = mt_rand(1, $proSum);
         //概率数组循环
         //概率数组循环
         foreach ($proArr as $key => $proCur) {
         foreach ($proArr as $key => $proCur) {
             $randNum = mt_rand(1, $proSum);
             $randNum = mt_rand(1, $proSum);

+ 3 - 2
public/themes/default/views/mobile/app/active/spring.blade.php

@@ -353,8 +353,7 @@
                     return;
                     return;
                 }
                 }
 
 
-                turnplate.number--;
-                $('#number').html(turnplate.number);
+                // $('#number').html(turnplate.number);
 
 
                 if (turnplate.bRotate) return;
                 if (turnplate.bRotate) return;
                 turnplate.bRotate = !turnplate.bRotate;
                 turnplate.bRotate = !turnplate.bRotate;
@@ -365,6 +364,7 @@
                     _token: "{{csrf_token()}}"
                     _token: "{{csrf_token()}}"
                 }, function (json) {
                 }, function (json) {
                     if (json.status) {
                     if (json.status) {
+                        turnplate.number--;
                         var item = 0;
                         var item = 0;
                         for (var i = 0; i < turnplate.ids.length; i++) {
                         for (var i = 0; i < turnplate.ids.length; i++) {
                             if (turnplate.ids[i] == json.id) {
                             if (turnplate.ids[i] == json.id) {
@@ -376,6 +376,7 @@
                         rotateFn(item, json.msg);
                         rotateFn(item, json.msg);
                     } else {
                     } else {
                         alert(json.msg);
                         alert(json.msg);
+                        turnplate.bRotate = !turnplate.bRotate;
                     }
                     }
                 }, 'json');
                 }, 'json');
 
 

+ 3 - 2
public/themes/default/views/mobile/app/active/spring_special_jkq.blade.php

@@ -433,8 +433,7 @@
                     return;
                     return;
                 }
                 }
 
 
-                turnplate.number--;
-                $('#number').html(turnplate.number);
+                // $('#number').html(turnplate.number);
 
 
                 if (turnplate.bRotate) return;
                 if (turnplate.bRotate) return;
                 turnplate.bRotate = !turnplate.bRotate;
                 turnplate.bRotate = !turnplate.bRotate;
@@ -445,6 +444,7 @@
                     _token: "{{csrf_token()}}"
                     _token: "{{csrf_token()}}"
                 }, function (json) {
                 }, function (json) {
                     if (json.status) {
                     if (json.status) {
+                        turnplate.number--;
                         var item = 0;
                         var item = 0;
                         for (var i = 0; i < turnplate.ids.length; i++) {
                         for (var i = 0; i < turnplate.ids.length; i++) {
                             if (turnplate.ids[i] == json.id) {
                             if (turnplate.ids[i] == json.id) {
@@ -456,6 +456,7 @@
                         rotateFn(item, json.msg);
                         rotateFn(item, json.msg);
                     } else {
                     } else {
                         alert(json.msg);
                         alert(json.msg);
+                        turnplate.bRotate = !turnplate.bRotate;
                     }
                     }
                 }, 'json');
                 }, 'json');