追加推送 6/10

Application/Api/Controller/Betorder.php

@@ -39,7 +39,7 @@ class Betorder extends BaseController{
             foreach ($v as $kk =>$vv){
                 $num = $kk+1;
                 //验证联赛是否存在
-                $this->verify_league($vv['ballId'],$vv['lg_id'],$num);
+                $this->verify_league($vv['ballId'],(int)$vv['lg_id'],$num);
                 //验证赛事是否存在
                 $this->verify_match($vv['ballId'],$vv['match_id'],$num);
                 //验证球类代码是否有效
@@ -243,7 +243,7 @@ class Betorder extends BaseController{
         $model_league = $model['model_league'];
         $info = lm($model_league,'Sports')
             ->select('id')
-            ->where('id',$lg_id)
+            ->where('lg_id',$lg_id)
             ->first();
         if(empty($info)){
             $msg = '第'.$num.'条'.lang('Errors','Api')->get('error-5113');

Application/Sports/Controller/MatchListWeb.php

@@ -12,6 +12,7 @@ use Biz\Match\GetmatchData;
 use Biz\Match\GetOddsData;
 use App\Sports\Model\St_area as areaModel;
 use App\Sports\Model\St_country as countryModel;
+use App\Sports\Model\St_zq_odds as ZQoddsModel;
 
 /**
  * Class MatchListWeb
@@ -331,6 +332,7 @@ class MatchListWeb extends Controller{
         }
         $select = ['match_id','p_code'];
         $whereOr = [];
+        //有父级玩法，则获取该玩法下详细数据
         if($p_code){
             $select = ['lg_id','match_id','id','p_code','odds_code','condition','odds','odds_only','sort','status','team'];
             //获取冠军盘口
@@ -405,6 +407,26 @@ class MatchListWeb extends Controller{
                 return $oddsData;
             }
         }
+        //如果是滚球，则获取滚球下详细数据
+        if($type == 'StRollBall'){
+            $select = ['lg_id','match_id','id','p_code','odds_code','condition','odds','odds_only','sort','status','team'];
+            $whereOr = [['sort','=',0]];
+            //获取滚球下，各球类默认玩法代码
+            if($game_code == 'zq'){
+                $p_code = ['concede','goal_size'];
+            }
+            if($game_code == 'lq'){
+                $p_code = ['concede','total_size','team_score'];
+            }
+            if($game_code == 'wq'){
+                $p_code = ['dishes','bureau','total_number'];
+            }
+            if($game_code == 'bq'){
+                $p_code = ['concede','total_size','two_sides'];
+            }
+            $oddsData = ZQoddsModel::getOddsDataPC($model_odds,$select,$match_id,$whereOr,$p_code);
+            return $oddsData;
+        }
         $oddsData = lm($model_odds,"Sports")
             ->select($select)
             ->whereIn('match_id', $match_id)

Application/Sports/Model/St_zq_odds.php

@@ -25,6 +25,19 @@ class St_zq_odds extends Model
         return $oddsData;
     }
 
+    //获取赔率数据 用于pc端
+    public static function getOddsDataPC($model_odds='',$select=[],$match_ids=[],$whereOr=[],$p_code=[]){
+        $oddsData = lm($model_odds,"Sports")
+            ->select($select)
+            ->whereIn('match_id', $match_ids)
+            ->where($whereOr)
+            ->whereIn('p_code',['dishes','bureau','total_number'])
+            ->get()
+            ->toArray();
+
+        return $oddsData;
+    }
+
     //获取足球赛事下 滚球盘默认赔率
     public static function getMatchOdds($source,$models,$match_ids=[]){
         $model_odds = $models['model_odds'];