Merge remote-tracking branch 'origin/develop' into develop

application/api/model/Lottery.php

@@ -71,7 +71,7 @@ class Lottery extends Model
         if($gift_id == $pool_gift_ids['pool_gift_id_5']){
             $table = 'bb_lottery_gift_record_5';
             $poole_type = 5;
-        }elseif ($gift_id == $pool_gift_ids['pool_gift_id_10']){
+        }elseif($gift_id == $pool_gift_ids['pool_gift_id_10']){
             $table = 'bb_lottery_gift_record_10';
             $poole_type = 10;
         }else{
@@ -152,7 +152,7 @@ class Lottery extends Model
             if($poole_type == 5){
                 $small_prize_play_image = db::name('bb_lottery_config')->where(['key' => 'big_prize_play_image'])->value('value');
                 $service = new LotteryService5();
-            }elseif ($poole_type == 10){
+            }elseif($poole_type == 10){
                 $small_prize_play_image = db::name('bb_lottery_config')->where(['key' => 'gao_prize_play_image'])->value('value');
                 $service = new LotteryService10();
             }else{

application/common/service/LotteryService10.php

@@ -12,7 +12,6 @@ class LotteryService10
     private $redis;
     // 配置参数
     private $config;
-    private $bigPrizeWeights;
 
     public function __construct()
     {
@@ -78,7 +77,7 @@ class LotteryService10
 
 
         // 加载Lua脚本
-        $luaSha = LotteryGiftLua::getLotteryLuaScript();
+        $luaSha = LotteryGiftLua::getLotteryLuaScript10();
 
         // 执行Lua脚本（入参：small_round + big_round）
         $result = $this->redis->eval($luaSha, [