彭俊 пре 6 година
родитељ
комит
110a6ce839

+ 0 - 1
Application/Sports/Controller/Head.php

@@ -265,7 +265,6 @@ class Head extends Controller{
                     }
                 }
             }
-
         }
         $matchNum = array_sum($matchNum);
 

+ 34 - 16
Application/Sports/Controller/MatchListWeb.php

@@ -370,7 +370,7 @@ where a.match_id = b.match_id and a.id = b.id ";
             $areaList = [];
             foreach ($area as $k=>$v){
                 foreach ($match_odds as $kk=>$vv){
-                    if($v['id'] == $vv['area_id']){
+                    if($v['id'] == $vv['area_id'] and $vv['country_id'] == 0){
                         unset($vv['last_time']);
                         //联赛下父级玩法 盘口数量
                         $oddsCode = array_column($vv['oddsData'], 'odds_code');
@@ -506,7 +506,7 @@ where a.match_id = b.match_id and a.id = b.id ";
         $areaList = [];
         foreach ($area as $k=>$v){
             foreach ($matchData as $kk=>$vv){
-                if($v['id'] == $vv['area_id']){
+                if($v['id'] == $vv['area_id'] and $vv['country_id'] == 0){
                     //联赛下赛事数量
                     $vv['matchNum'] = count($vv['matchData']);
                     unset($vv['matchData']);
@@ -528,15 +528,21 @@ where a.match_id = b.match_id and a.id = b.id ";
      * 根据match_id获取赔率数据
      */
     public function getOddsData($game_code,$model_odds,$match_ids=[],$lg_ids=[],$p_code='',$type=''){
+        //获取pc版各球类滚球/让球玩法代码
+        $get_DefaultOdds = require "Config/DefaultOdds.php";
+        $DefaultOddsRoll = $get_DefaultOdds['PC_StRollBall'];//滚球
+        $DefaultOddsConcede = $get_DefaultOdds['PC_concede'];//让球
+
         $select = ['match_id','p_code'];
         $whereOr = [];
+        //如果是串场赛事,则获取串场赔率
+        if($type== 'StStringScene'){
+            $whereOr = [['sort','=',0],['status','=',0],['is_stringscene','=',1]];
+        }else{
+            $whereOr = [['sort','=',0],['status','=',0],['is_stringscene','=',0]];
+        }
         //有父级玩法,则获取该玩法下详细数据
-        if($p_code){
-            if($type== 'StStringScene'){
-                $whereOr = [['sort','=',0],['status','=',0],['is_stringscene','=',1]];
-            }else{
-                $whereOr = [['sort','=',0],['status','=',0],['is_stringscene','=',0]];
-            }
+        if($p_code){ 
             $select = ['lg_id','match_id','others_match_id','id','p_code','odds_code','condition','odds','odds_only','sort','status','team'];
             //获取冠军盘口
             if($p_code == 'kemp'){
@@ -544,17 +550,25 @@ where a.match_id = b.match_id and a.id = b.id ";
                 $oddsData = ZQoddsModel::getOddsDataPC($model_odds,$select,$lg_ids,$whereOr,$p_code);
                 return $oddsData;
             }
+            //足球 让球
             else if($p_code == 'concede' and $game_code == 'zq'){
-                $p_code = ['concede','goal_size'];
+                $p_code = $DefaultOddsConcede['zq'];
+                //$p_code = ['CO','GS'];//让球 进球大小
             }
+            //篮球 让球
             else if($p_code == 'concede'  and $game_code == 'lq'){
-                $p_code = ['concede','total_size','team_score'];
+                $p_code = $DefaultOddsConcede['lq'];
+                //$p_code = ['CO','TN','TB'];//让球 总分大小 球队得分大小
             }
+            //网球 让球
             else if($p_code == 'concede'  and $game_code == 'wq'){
-                $p_code = ['dishes','bureau','total_number'];
+                $p_code = $DefaultOddsConcede['wq'];
+                // $p_code = ['LD','LB','TN'];//让盘 让局 总局数大小
             }
+            //棒球 让球
             else if($p_code == 'concede'  and $game_code == 'bq'){
-                $p_code = ['concede','total_size','two_sides'];
+                $p_code = $DefaultOddsConcede['bq'];
+                // $p_code = ['CO','TN','TS'];//让球 总得分大小 总得分单双
             }else{
                 $p_code = [$p_code];
             }
@@ -567,16 +581,20 @@ where a.match_id = b.match_id and a.id = b.id ";
             $whereOr = [['sort','=',0],['status','=',0],['is_stringscene','=',0]];
             //获取滚球下,各球类默认玩法代码
             if($game_code == 'zq'){
-                $p_code = ['concede','goal_size','capot'];
+                $p_code = $DefaultOddsRoll['zq'];
+                //$p_code = ['CO','GS','C'];//让球 进球大小 独赢
             }
             if($game_code == 'lq'){
-                $p_code = ['concede','total_size','team_score','capot'];
+                $p_code = $DefaultOddsRoll['lq'];
+                //$p_code = ['CO','TN','TB','C'];//让球 得分大小 得分单双 独赢盘
             }
             if($game_code == 'wq'){
-                $p_code = ['dishes','bureau','total_number'];
+                $p_code = $DefaultOddsRoll['wq'];
+                //$p_code = ['LD','LB','TN'];//让盘 让局 总局数大小
             }
             if($game_code == 'bq'){
-                $p_code = ['concede','total_size','two_sides','capot'];
+                $p_code = $DefaultOddsRoll['bq'];
+                //$p_code = ['CO','TN','TS','C'];//让球 总得分大小 总得分单双 独赢盘
             }
             $oddsData = ZQoddsModel::getOddsDataPC($model_odds,$select,$match_ids,$whereOr,$p_code);
             return $oddsData;

+ 14 - 13
Application/Sports/Model/St_bq_odds.php

@@ -27,28 +27,29 @@ class St_bq_odds extends Model
     }
 
     //获取棒球赛事下 默认赔率数据
-    public static function getMatchOdds($source,$match_ids=[]){
+    public static function getMatchOdds($source,$match_ids=[],$DefaultOdds=[]){
+         
         $oddsData = self::select('match_id','id','p_code','odds_code','status','odds','condition','sort','odds_only')
 //            ->where($source)
             ->whereIn('match_id',$match_ids)
             ->where('is_stringscene',0)
             ->where(['type'=>0,'status'=>0])//查询滚球赔率
-            ->where(function($query){
-                $query->where('odds_code','concede_home')
-                    ->orWhere(function($query){
-                        $query->where('odds_code','concede_guest');
+            ->where(function($query)use ($DefaultOdds){
+                $query->where('odds_code',$DefaultOdds['bq_concede_home'])
+                    ->orWhere(function($query)use ($DefaultOdds){
+                        $query->where('odds_code',$DefaultOdds['bq_concede_guest']);
                     })
-                    ->orWhere(function($query){
-                        $query->where('odds_code','total_size_small');
+                    ->orWhere(function($query)use ($DefaultOdds){
+                        $query->where('odds_code',$DefaultOdds['bq_total_size_small']);
                     })
-                    ->orWhere(function($query){
-                        $query->where('odds_code','total_size_big');
+                    ->orWhere(function($query)use ($DefaultOdds){
+                        $query->where('odds_code',$DefaultOdds['bq_total_size_big']);
                     })
-                    ->orWhere(function($query){
-                        $query->where('odds_code','capot_home');
+                    ->orWhere(function($query)use ($DefaultOdds){
+                        $query->where('odds_code',$DefaultOdds['bq_capot_home']);
                     })
-                    ->orWhere(function($query){
-                        $query->where('odds_code','capot_guest');
+                    ->orWhere(function($query)use ($DefaultOdds){
+                        $query->where('odds_code',$DefaultOdds['bq_capot_guest']);
                     });
             })
             ->get()

+ 15 - 14
Application/Sports/Model/St_lq_odds.php

@@ -27,31 +27,32 @@ class St_lq_odds extends Model
     }
 
     //获取篮球赛事下 默认赔率数据
-    public static function getMatchOdds($source,$match_ids=[]){
+    public static function getMatchOdds($source,$match_ids=[],$DefaultOdds=[]){
+         
         $oddsData = self::select('match_id','id','p_code','odds_code','status','odds','condition','sort','odds_only')
 //            ->where($source)
             ->whereIn('match_id',$match_ids)
             ->where(['type'=>0,'status'=>0])//查询滚球赔率
             ->where('is_stringscene',0)
-            ->where(function($query){
+            ->where(function($query)use ($DefaultOdds){
                 $query->where('odds_code','concede_home')
-                    ->orWhere(function($query){
-                        $query->where('odds_code','concede_guest');
+                    ->orWhere(function($query)use ($DefaultOdds){
+                        $query->where('odds_code',$DefaultOdds['lq_concede_home']);
                     })
-                    ->orWhere(function($query){
-                        $query->where('odds_code','total_sizes_big');
+                    ->orWhere(function($query)use ($DefaultOdds){
+                        $query->where('odds_code',$DefaultOdds['lq_concede_guest']);
                     })
-                    ->orWhere(function($query){
-                        $query->where('odds_code','total_sizes_small');
+                    ->orWhere(function($query)use ($DefaultOdds){
+                        $query->where('odds_code',$DefaultOdds['lq_total_size_big']);
                     })
-                    ->orWhere(function($query){
-                        $query->where('odds_code','capot_home');
+                    ->orWhere(function($query)use ($DefaultOdds){
+                        $query->where('odds_code',$DefaultOdds['lq_total_size_small']);
                     })
-                    ->orWhere(function($query){
-                        $query->where('odds_code','capot_dogfall');
+                    ->orWhere(function($query)use ($DefaultOdds){
+                        $query->where('odds_code',$DefaultOdds['lq_capot_home']);
                     })
-                    ->orWhere(function($query){
-                        $query->where('odds_code','capot_guest');
+                    ->orWhere(function($query)use ($DefaultOdds){
+                        $query->where('odds_code',$DefaultOdds['lq_capot_guest']);
                     });
             })
             ->get()

+ 10 - 9
Application/Sports/Model/St_wq_odds.php

@@ -27,23 +27,24 @@ class St_wq_odds extends Model
     }
 
     //获取网球赛事下 默认赔率数据
-    public static function getMatchOdds($source,$match_ids=[]){
+    public static function getMatchOdds($source,$match_ids=[],$DefaultOdds=[]){
+         
         $oddsData = self::select('match_id','id','p_code','odds_code','status','odds','condition','sort','odds_only')
 //            ->where($source)
             ->whereIn('match_id',$match_ids)
             ->where('is_stringscene',0)
             ->where(['type'=>0,'status'=>0])//查询滚球赔率
             ->where(
-                function($query){
-                    $query->where('odds_code','dishes_home')
-                        ->orWhere(function($query){
-                            $query->where('odds_code','dishes_guest');
+                function($query)use ($DefaultOdds){
+                    $query->where('odds_code',$DefaultOdds['wq_dishes_home'])
+                        ->orWhere(function($query)use ($DefaultOdds){
+                            $query->where('odds_code',$DefaultOdds['wq_dishes_guest']);
                         })
-                        ->orWhere(function($query){
-                            $query->where('odds_code','kemp_home');
+                        ->orWhere(function($query)use ($DefaultOdds){
+                            $query->where('odds_code',$DefaultOdds['wq_kemp_home']);
                         })
-                        ->orWhere(function($query){
-                            $query->where('odds_code','kemp_guest');
+                        ->orWhere(function($query)use ($DefaultOdds){
+                            $query->where('odds_code',$DefaultOdds['wq_kemp_guest']);
                         });
                 }
             )

+ 17 - 15
Application/Sports/Model/St_zq_odds.php

@@ -58,7 +58,9 @@ class St_zq_odds extends Model
     }
 
     //获取足球赛事下 滚球盘默认赔率
-    public static function getMatchOdds($source,$models,$match_ids=[]){
+    public static function getMatchOdds($source,$models,$match_ids=[],$DefaultOdds=[]){
+        
+        //不是串场赔率
         $oddsTypeWhere = [
             [$models['model_odds'].'.is_stringscene','=',0],
         ];
@@ -68,25 +70,25 @@ class St_zq_odds extends Model
             ->whereIn($model_odds.'.match_id',$match_ids)
             ->where([$model_odds.'.type'=>0,$model_odds.'.status'=>0])//查询滚球赔率
             ->where($oddsTypeWhere)
-            ->where(function($query)use ($model_odds){
-                $query->where($model_odds.'.odds_code','concede_home')
-                    ->orWhere(function($query)use ($model_odds){
-                        $query->where($model_odds.'.odds_code','concede_guest');
+            ->where(function($query)use ($model_odds,$DefaultOdds){
+                $query->where($model_odds.'.odds_code',$DefaultOdds['zq_concede_home'])
+                    ->orWhere(function($query)use ($model_odds,$DefaultOdds){
+                        $query->where($model_odds.'.odds_code',$DefaultOdds['zq_concede_guest']);
                     })
-                    ->orWhere(function($query)use ($model_odds){
-                        $query->where($model_odds.'.odds_code','goal_size_big');
+                    ->orWhere(function($query)use ($model_odds,$DefaultOdds){
+                        $query->where($model_odds.'.odds_code',$DefaultOdds['zq_goal_size_big']);
                     })
-                    ->orWhere(function($query)use ($model_odds){
-                        $query->where($model_odds.'.odds_code','goal_size_small');
+                    ->orWhere(function($query)use ($model_odds,$DefaultOdds){
+                        $query->where($model_odds.'.odds_code',$DefaultOdds['zq_goal_size_small']);
                     })
-                    ->orWhere(function($query)use ($model_odds){
-                        $query->where($model_odds.'.odds_code','capot_home');
+                    ->orWhere(function($query)use ($model_odds,$DefaultOdds){
+                        $query->where($model_odds.'.odds_code',$DefaultOdds['zq_capot_home']);
                     })
-                    ->orWhere(function($query)use ($model_odds){
-                        $query->where($model_odds.'.odds_code','capot_dogfall');
+                    ->orWhere(function($query)use ($model_odds,$DefaultOdds){
+                        $query->where($model_odds.'.odds_code',$DefaultOdds['zq_capot_dogfall']);
                     })
-                    ->orWhere(function($query)use ($model_odds){
-                        $query->where($model_odds.'.odds_code','capot_guest');
+                    ->orWhere(function($query)use ($model_odds,$DefaultOdds){
+                        $query->where($model_odds.'.odds_code',$DefaultOdds['zq_capot_guest']);
                     });
             })
             ->get()

+ 1 - 1
Biz/Common/CommonFunction.php

@@ -1130,7 +1130,7 @@ class CommonFunction {
         return $r;
     }
 
-// 阶乘
+// 阶乘 
     function factorial($n) {
         return array_product(range(1, $n));
     }

+ 58 - 42
Biz/Match/GetOddsData.php

@@ -99,22 +99,25 @@ class GetOddsData {
         foreach ($matchData as $k=>$v){
             $match_ids[] = (int)$v['match_id'];
         }
+        //获取非滚球/即将状态足球默认玩法
+        $get_DefaultOdds = require "Config/DefaultOdds.php";
+        $DefaultOdds = $get_DefaultOdds['Other']['zq'];
         $oddsData = lm($model_odds, 'Sports')
             ->select('match_id','id','p_code','odds_code','status','odds','condition','sort','odds_only')
             ->whereIn('match_id',$match_ids)
             ->where(['status'=>0])
             ->where($oddsTypeWhere)
             ->where(
-                function($query)use ($model_odds){
-                    $query->where($model_odds.'.odds_code','concede_home')
-                        ->orWhere(function($query)use ($model_odds){
-                            $query->where($model_odds.'.odds_code','concede_guest');
+                function($query)use ($model_odds,$DefaultOdds){
+                    $query->where($model_odds.'.odds_code',$DefaultOdds['zq_concede_home'])
+                        ->orWhere(function($query)use ($model_odds,$DefaultOdds){
+                            $query->where($model_odds.'.odds_code',$DefaultOdds['zq_concede_guest']);
                         })
-                        ->orWhere(function($query)use ($model_odds){
-                            $query->where($model_odds.'.odds_code','goal_size_big');
+                        ->orWhere(function($query)use ($model_odds,$DefaultOdds){
+                            $query->where($model_odds.'.odds_code',$DefaultOdds['zq_goal_size_big']);
                         })
-                        ->orWhere(function($query)use ($model_odds){
-                            $query->where($model_odds.'.odds_code','goal_size_small');
+                        ->orWhere(function($query)use ($model_odds,$DefaultOdds){
+                            $query->where($model_odds.'.odds_code',$DefaultOdds['zq_goal_size_small']);
                         });
                 }
             )
@@ -125,16 +128,16 @@ class GetOddsData {
             $odds = [];
             foreach ($oddsData as $kkk=>$vvv) {
                 if ($vv['match_id'] == $vvv['match_id'] and $vvv['sort']==0) {
-                    if($vvv['odds_code'] == 'concede_guest'){
+                    if($vvv['odds_code'] == $DefaultOdds['zq_concede_guest']){
                         $concede_g = $vvv;
                     }
-                    if($vvv['odds_code'] == 'concede_home'){
+                    if($vvv['odds_code'] == $DefaultOdds['zq_concede_home']){
                         $concede_h = $vvv;
                     }
-                    if($vvv['odds_code'] == 'goal_size_big'){
+                    if($vvv['odds_code'] == $DefaultOdds['zq_goal_size_small']){
                         $size_s = $vvv;
                     }
-                    if($vvv['odds_code'] == 'goal_size_small'){
+                    if($vvv['odds_code'] == $DefaultOdds['zq_goal_size_big']){
                         $size_b = $vvv;
                     }
                 }
@@ -167,22 +170,26 @@ class GetOddsData {
         foreach ($matchData as $k=>$v){
             $match_ids[] = $v['match_id'];
         }
+        //获取非滚球/即将状态篮球默认玩法
+        $get_DefaultOdds = require "Config/DefaultOdds.php";
+        $DefaultOdds = $get_DefaultOdds['Other']['lq'];
+
         $oddsData = lm($model_odds, 'Sports')
             ->select('match_id','id','p_code','odds_code','status','odds','condition','sort','odds_only')
             ->whereIn('match_id',$match_ids)
             ->where(['status'=>0])
             ->where($oddsTypeWhere)
             ->where(
-                function($query)use ($model_odds){
-                    $query->where($model_odds.'.odds_code','concede_home')
-                        ->orWhere(function($query)use ($model_odds){
-                            $query->where($model_odds.'.odds_code','concede_guest');
+                function($query)use ($model_odds,$DefaultOdds){
+                    $query->where($model_odds.'.odds_code',$DefaultOdds['lq_concede_home'])
+                        ->orWhere(function($query)use ($model_odds,$DefaultOdds){
+                            $query->where($model_odds.'.odds_code',$DefaultOdds['lq_concede_guest']);
                         })
-                        ->orWhere(function($query)use ($model_odds){
-                            $query->where($model_odds.'.odds_code','total_size_big');
+                        ->orWhere(function($query)use ($model_odds,$DefaultOdds){
+                            $query->where($model_odds.'.odds_code',$DefaultOdds['lq_total_size_big']);
                         })
-                        ->orWhere(function($query)use ($model_odds){
-                            $query->where($model_odds.'.odds_code','total_size_small');
+                        ->orWhere(function($query)use ($model_odds,$DefaultOdds){
+                            $query->where($model_odds.'.odds_code',$DefaultOdds['lq_total_size_small']);
                         });
                 }
             )
@@ -193,16 +200,16 @@ class GetOddsData {
             $odds = [];
             foreach ($oddsData as $kkk=>$vvv) {
                 if ($vv['match_id'] == $vvv['match_id'] and $vvv['sort']==0) {
-                    if($vvv['odds_code'] == 'concede_guest'){
+                    if($vvv['odds_code'] == $DefaultOdds['lq_concede_guest']){
                         $concede_g = $vvv;
                     }
-                    if($vvv['odds_code'] == 'concede_home'){
+                    if($vvv['odds_code'] == $DefaultOdds['lq_concede_home']){
                         $concede_h = $vvv;
                     }
-                    if($vvv['odds_code'] == 'total_size_big'){
+                    if($vvv['odds_code'] == $DefaultOdds['lq_total_size_small']){
                         $size_s = $vvv;
                     }
-                    if($vvv['odds_code'] == 'total_size_small'){
+                    if($vvv['odds_code'] == $DefaultOdds['lq_total_size_big']){
                         $size_b = $vvv;
                     }
                 }
@@ -235,22 +242,26 @@ class GetOddsData {
         foreach ($matchData as $k=>$v){
             $match_ids[] = $v['match_id'];
         }
+        //获取非滚球/即将状态网球默认玩法
+        $get_DefaultOdds = require "Config/DefaultOdds.php";
+        $DefaultOdds = $get_DefaultOdds['Other']['wq'];
+
         $oddsData = lm($model_odds, 'Sports')
             ->select('match_id','id','p_code','odds_code','status','odds','condition','sort','odds_only')
             ->whereIn('match_id',$match_ids)
             ->where(['status'=>0])
             ->where($oddsTypeWhere)
             ->where(
-                function($query)use ($model_odds){
-                    $query->where($model_odds.'.odds_code','dishes_home')
-                        ->orWhere(function($query)use ($model_odds){
-                            $query->where($model_odds.'.odds_code','dishes_guest');
+                function($query)use ($model_odds,$DefaultOdds){
+                    $query->where($model_odds.'.odds_code',$DefaultOdds['wq_dishes_home'])
+                        ->orWhere(function($query)use ($model_odds,$DefaultOdds){
+                            $query->where($model_odds.'.odds_code',$DefaultOdds['wq_dishes_guest']);
                         })
-                        ->orWhere(function($query)use ($model_odds){
-                            $query->where($model_odds.'.odds_code','kemp_home');
+                        ->orWhere(function($query)use ($model_odds,$DefaultOdds){
+                            $query->where($model_odds.'.odds_code',$DefaultOdds['wq_kemp_home']);
                         })
-                        ->orWhere(function($query)use ($model_odds){
-                            $query->where($model_odds.'.odds_code','kemp_guest');
+                        ->orWhere(function($query)use ($model_odds,$DefaultOdds){
+                            $query->where($model_odds.'.odds_code',$DefaultOdds['wq_kemp_guest']);
                         });
                 }
             )
@@ -261,16 +272,16 @@ class GetOddsData {
             $odds = [];
             foreach ($oddsData as $kkk=>$vvv) {
                 if ($vv['match_id'] == $vvv['match_id'] and $vvv['sort']==0) {
-                    if($vvv['odds_code'] == 'dishes_home'){
+                    if($vvv['odds_code'] == $DefaultOdds['wq_dishes_guest']){
                         $concede_g = $vvv;
                     }
-                    if($vvv['odds_code'] == 'dishes_guest'){
+                    if($vvv['odds_code'] == $DefaultOdds['wq_dishes_home']){
                         $concede_h = $vvv;
                     }
-                    if($vvv['odds_code'] == 'kemp_home'){
+                    if($vvv['odds_code'] ==$DefaultOdds['wq_kemp_home']){
                         $size_s = $vvv;
                     }
-                    if($vvv['odds_code'] == 'kemp_guest'){
+                    if($vvv['odds_code'] == $DefaultOdds['wq_kemp_guest']){
                         $size_b = $vvv;
                     }
                 }
@@ -302,16 +313,21 @@ class GetOddsData {
         foreach ($matchData as $k=>$v){
             $match_ids[] = $v['match_id'];
         }
+
+        //获取非滚球/即将状态网球默认玩法
+        $get_DefaultOdds = require "Config/DefaultOdds.php";
+        $DefaultOdds = $get_DefaultOdds['Other']['bq'];
+
         $oddsData = lm($model_odds, 'Sports')
             ->select('match_id','id','p_code','odds_code','status','odds','condition','sort','odds_only')
             ->whereIn('match_id',$match_ids)
             ->where(['status'=>0])
             ->where($oddsTypeWhere)
             ->where(
-                function($query)use ($model_odds){
-                    $query->where($model_odds.'.odds_code','capot_home')
-                        ->orWhere(function($query)use ($model_odds){
-                            $query->where($model_odds.'.odds_code','capot_guest');
+                function($query)use ($model_odds,$DefaultOdds){
+                    $query->where($model_odds.'.odds_code',$DefaultOdds['bq_capot_home'])
+                        ->orWhere(function($query)use ($model_odds,$DefaultOdds){
+                            $query->where($model_odds.'.odds_code',$DefaultOdds['bq_capot_guest']);
                         });
                 }
             )
@@ -322,10 +338,10 @@ class GetOddsData {
             $odds = [];
             foreach ($oddsData as $kkk=>$vvv) {
                 if ($vv['match_id'] == $vvv['match_id'] and $vvv['sort']==0) {
-                    if($vvv['odds_code'] == 'capot_home'){
+                    if($vvv['odds_code'] == $DefaultOdds['bq_capot_home']){
                         $concede_g = $vvv;
                     }
-                    if($vvv['odds_code'] == 'capot_guest'){
+                    if($vvv['odds_code'] == $DefaultOdds['bq_capot_guest']){
                         $concede_h = $vvv;
                     }
                 }

+ 86 - 30
Biz/Match/GetmatchData.php

@@ -110,35 +110,39 @@ class GetmatchData {
      */
     public function getDefault($data,$game_code,$models,$match_ids,$source,$type_code=''){
         if($game_code == 'zq') {
+            //获取滚球下足球默认玩法
+            $get_DefaultOdds = require "Config/DefaultOdds.php";
+            $DefaultOdds = $get_DefaultOdds['StRollBall']['zq'];
+    
             //获取赛事下默认赔率
-            $oddsData = ZQoddsModel::getMatchOdds($source, $models,$match_ids);
+            $oddsData = ZQoddsModel::getMatchOdds($source, $models,$match_ids,$DefaultOdds);
             foreach ($data as $k=>$v){
                 foreach ($v['matchData'] as $kk=>$vv){
                     //获取赛事下赔率并且分组
                     foreach ($oddsData as $kkk=>$vvv) {
                         if($type_code == 'StRollBall'){
-                            $vvv['oddsType'] = 'StRollBall';
+                        $vvv['oddsType'] = 'StRollBall';
                         }
                         if ($vv['match_id'] == $vvv['match_id'] and $vvv['sort']==0) {
-                            if($vvv['odds_code'] == 'concede_guest'){
+                            if($vvv['odds_code'] == $DefaultOdds['zq_concede_guest']){
                                 $concede_g = $vvv;
                             }
-                            if($vvv['odds_code'] == 'concede_home'){
+                            if($vvv['odds_code'] == $DefaultOdds['zq_concede_home']){
                                 $concede_h = $vvv;
                             }
-                            if($vvv['odds_code'] == 'goal_size_big'){
+                            if($vvv['odds_code'] == $DefaultOdds['zq_goal_size_big']){
                                 $size_s = $vvv;
                             }
-                            if($vvv['odds_code'] == 'goal_size_small'){
+                            if($vvv['odds_code'] == $DefaultOdds['zq_goal_size_small']){
                                 $size_b = $vvv;
                             }
-                            if($vvv['odds_code'] == 'capot_home'){
+                            if($vvv['odds_code'] == $DefaultOdds['zq_capot_home']){
                                 $capot_h = $vvv;
                             }
-                            if($vvv['odds_code'] == 'capot_dogfall'){
+                            if($vvv['odds_code'] == $DefaultOdds['zq_capot_dogfall']){
                                 $capot_d = $vvv;
                             }
-                            if($vvv['odds_code'] == 'capot_guest'){
+                            if($vvv['odds_code'] == $DefaultOdds['zq_capot_guest']){
                                 $capot_g = $vvv;
                             }
                         }
@@ -160,7 +164,11 @@ class GetmatchData {
             }
         }
         if($game_code == 'lq') {
-            $oddsData = LQoddsModel::getMatchOdds($source,$match_ids);
+           //获取滚球下篮球默认玩法
+            $get_DefaultOdds = require "Config/DefaultOdds.php";
+            $DefaultOdds = $get_DefaultOdds['StRollBall']['lq'];
+            //获取默认赔率
+            $oddsData = LQoddsModel::getMatchOdds($source,$match_ids,$DefaultOdds);
             foreach ($data as $k=>$v){
                 foreach ($v['matchData'] as $kk=>$vv){
                     //获取赛事下赔率并且分组
@@ -172,25 +180,50 @@ class GetmatchData {
                             $vvv['oddsType'] = 'StRollBall';
                         }
                         if ($vv['match_id'] == $vvv['match_id'] and $vvv['sort']==0) {
-                            if($vvv['p_code'] == 'capot'){
-                                $capot[] = $vvv;
-                            }else{
-                                if($vvv['p_code'] == 'total_size'){
-                                    $total_size[] = $vvv;
-                                }
-                                if($vvv['p_code'] == 'concede'){
-                                    $concede[] = $vvv;
-                                }
+                            if($vvv['odds_code'] == $DefaultOdds['lq_concede_home']){
+                                $concede_g = $vvv;
+                            }
+                            if($vvv['odds_code'] == $DefaultOdds['lq_concede_guest']){
+                                $concede_h = $vvv;
+                            }
+                            if($vvv['odds_code'] == $DefaultOdds['lq_total_size_big']){
+                                $size_s = $vvv;
+                            }
+                            if($vvv['odds_code'] == $DefaultOdds['lq_total_size_small']){
+                                $size_b = $vvv;
+                            }
+                            if($vvv['odds_code'] == $DefaultOdds['lq_capot_home']){
+                                $capot_h = $vvv;
+                            }
+                            if($vvv['odds_code'] == $DefaultOdds['lq_capot_guest']){
+                                $capot_g = $vvv;
                             }
                         }
                     }
-                    $concede_size = [$concede[0],$concede[1],$total_size[0],$total_size[1]];
+
+
+                    $concede_size = [$concede_g,$concede_h,$size_s,$size_b];
+                    $capot = [$capot_h,$capot_g];
+                    foreach ($concede_size as $key => $vaule){
+                        if($vaule == null) unset($concede_size[$key]);
+                    }
+
+                    foreach ($capot as $key1 => $vaule1){
+                        if($vaule1 == null) unset($capot[$key1]);
+                    }
+                    sort($concede_size);
+                    sort($capot);
+
                     $data[$k]['matchData'][$kk]['oddsData'] = [$concede_size,$capot];
                 }
             }
         }
         if($game_code == 'wq') {
-            $oddsData = WQoddsModel::getMatchOdds($source,$match_ids);
+            //获取滚球下网球默认玩法
+            $get_DefaultOdds = require "Config/DefaultOdds.php";
+            $DefaultOdds = $get_DefaultOdds['StRollBall']['wq'];
+            //获取网球默认赔率
+            $oddsData = WQoddsModel::getMatchOdds($source,$match_ids,$DefaultOdds);
             foreach ($data as $k=>$v){
                 foreach ($v['matchData'] as $kk=>$vv){
                     //获取赛事下赔率并且分组
@@ -200,15 +233,38 @@ class GetmatchData {
                             $vvv['oddsType'] = 'StRollBall';
                         }
                         if ($vv['match_id'] == $vvv['match_id'] and $vvv['sort']==0) {
-                            $odds[] = $vvv;
+
+                            if($vvv['odds_code'] == $DefaultOdds['wq_dishes_home']){
+                                $concede_g = $vvv;
+                            }
+                            if($vvv['odds_code'] == $DefaultOdds['wq_dishes_guest']){
+                                $concede_h = $vvv;
+                            }
+                            if($vvv['odds_code'] == $DefaultOdds['wq_kemp_home']){
+                                $size_s = $vvv;
+                            }
+                            if($vvv['odds_code'] == $DefaultOdds['wq_kemp_guest']){
+                                $size_b = $vvv;
+                            }
                         }
                     }
-                    $data[$k]['matchData'][$kk]['oddsData'] = $odds;
+                    $concede_size = [$concede_g,$concede_h,$size_s,$size_b];
+                    foreach ($concede_size as $key => $vaule){
+                        if($vaule == null) unset($concede_size[$key]);
+                    }
+
+                    sort($concede_size);
+                    $data[$k]['matchData'][$kk]['oddsData'] = $concede_size;
                 }
             }
         }
         if($game_code == 'bq') {
-            $oddsData = BQoddsModel::getMatchOdds($source,$match_ids);
+            //获取滚球下棒球默认玩法
+            $get_DefaultOdds = require "Config/DefaultOdds.php";
+            $DefaultOdds = $get_DefaultOdds['StRollBall']['bq'];
+
+            //获取默认赔率
+            $oddsData = BQoddsModel::getMatchOdds($source,$match_ids,$DefaultOdds);
             foreach ($data as $k=>$v){
                 foreach ($v['matchData'] as $kk=>$vv){
                     //获取赛事下赔率并且分组
@@ -218,22 +274,22 @@ class GetmatchData {
                             $vvv['oddsType'] = 'StRollBall';
                         }
                         if ($vv['match_id'] == $vvv['match_id'] and $vvv['sort']==0) {
-                            if($vvv['odds_code'] == 'concede_guest'){
+                            if($vvv['odds_code'] == $DefaultOdds['bq_concede_guest']){
                                 $concede_g = $vvv;
                             }
-                            if($vvv['odds_code'] == 'concede_home'){
+                            if($vvv['odds_code'] == $DefaultOdds['bq_concede_home']){
                                 $concede_h = $vvv;
                             }
-                            if($vvv['odds_code'] == 'total_size_small'){
+                            if($vvv['odds_code'] == $DefaultOdds['bq_total_size_small']){
                                 $size_s = $vvv;
                             }
-                            if($vvv['odds_code'] == 'total_size_big'){
+                            if($vvv['odds_code'] == $DefaultOdds['bq_total_size_big']){
                                 $size_b = $vvv;
                             }
-                            if($vvv['odds_code'] == 'capot_home'){
+                            if($vvv['odds_code'] == $DefaultOdds['bq_capot_home']){
                                 $capot_h = $vvv;
                             }
-                            if($vvv['odds_code'] == 'capot_guest'){
+                            if($vvv['odds_code'] == $DefaultOdds['bq_capot_guest']){
                                 $capot_g = $vvv;
                             }
                         }

+ 14 - 1
Config/DefaultOdds.php

@@ -67,7 +67,20 @@ return array(
             "bq_capot_home" =>"ch",//全场|主队|独赢
             "bq_capot_guest" =>"cg",//全场|客队|独赢
         )
+    ),
+    //pc版滚球默认玩法代码
+    "PC_StRollBall"=>array(
+        "zq"=>['CO','GS','C'],//让球 进球大小 独赢
+        "lq"=>['CO','TN','TB','C'],//让球 得分大小 得分单双 独赢盘
+        "wq"=>['LD','LB','TN'],//让盘 让局 总局数大小
+        "bq"=>['CO','TN','TS','C'],//让球 总得分大小 总得分单双 独赢盘
+    ),
+    //pc版让球默认玩法代码
+    "PC_concede"=>array(
+        "zq"=>['CO','GS'],//让球 进球大小
+        "lq"=>['CO','TN','TB'],//让球 总分大小 球队得分大小
+        "wq"=>['LD','LB','TN'],//让盘 让局 总局数大小
+        "bq"=>['CO','TN','TS'],//让球 总得分大小 总得分单双
     )
-   
 )
 ?>