|
|
@@ -121,9 +121,12 @@ class GetmatchData {
|
|
|
//获取赛事下赔率并且分组
|
|
|
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) {
|
|
|
+ //获取数据源ID
|
|
|
+ $vvv['sourceID'] = $this->commonFunction->getSourceID($vvv['source']);
|
|
|
+ unset($vvv['source']);
|
|
|
if($vvv['odds_code'] == $DefaultOdds['zq_concede_guest']){
|
|
|
$concede_g = $vvv;
|
|
|
}
|
|
|
@@ -180,6 +183,9 @@ class GetmatchData {
|
|
|
$vvv['oddsType'] = 'StRollBall';
|
|
|
}
|
|
|
if ($vv['match_id'] == $vvv['match_id'] and $vvv['sort']==0) {
|
|
|
+ //获取数据源ID
|
|
|
+ $vvv['sourceID'] = $this->commonFunction->getSourceID($vvv['source']);
|
|
|
+ unset($vvv['source']);
|
|
|
if($vvv['odds_code'] == $DefaultOdds['lq_concede_home']){
|
|
|
$concede_g = $vvv;
|
|
|
}
|
|
|
@@ -233,6 +239,9 @@ class GetmatchData {
|
|
|
$vvv['oddsType'] = 'StRollBall';
|
|
|
}
|
|
|
if ($vv['match_id'] == $vvv['match_id'] and $vvv['sort']==0) {
|
|
|
+ //获取数据源ID
|
|
|
+ $vvv['sourceID'] = $this->commonFunction->getSourceID($vvv['source']);
|
|
|
+ unset($vvv['source']);
|
|
|
|
|
|
if($vvv['odds_code'] == $DefaultOdds['wq_dishes_home']){
|
|
|
$concede_g = $vvv;
|
|
|
@@ -274,6 +283,9 @@ class GetmatchData {
|
|
|
$vvv['oddsType'] = 'StRollBall';
|
|
|
}
|
|
|
if ($vv['match_id'] == $vvv['match_id'] and $vvv['sort']==0) {
|
|
|
+ //获取数据源ID
|
|
|
+ $vvv['sourceID'] = $this->commonFunction->getSourceID($vvv['source']);
|
|
|
+ unset($vvv['source']);
|
|
|
if($vvv['odds_code'] == $DefaultOdds['bq_concede_guest']){
|
|
|
$concede_g = $vvv;
|
|
|
}
|
|
|
@@ -506,15 +518,18 @@ class GetmatchData {
|
|
|
->where('id',$lg_id)
|
|
|
->first()->last_time;
|
|
|
$championData = lm($model_odds, 'Sports')
|
|
|
- ->select("id","lg_id","match_id","p_code","odds_code","team","odds","sort","status","odds_only")
|
|
|
+ ->select("id","lg_id","match_id","p_code","odds_code","team","odds","sort","status","odds_only","source")
|
|
|
->where('lg_id',$lg_id)
|
|
|
->where($where)
|
|
|
->where(['status'=>0])
|
|
|
- ->groupBy("id","lg_id","match_id","p_code","odds_code","team","odds","sort","status","odds_only")
|
|
|
+ ->groupBy("id","lg_id","match_id","p_code","odds_code","team","odds","sort","status","odds_only","source")
|
|
|
->get()->toArray();
|
|
|
//按p_code分组
|
|
|
$p_code=array();
|
|
|
foreach($championData as $k=>$v){
|
|
|
+ //获取数据源ID
|
|
|
+ $v['sourceID'] = $this->commonFunction->getSourceID($v['source']);
|
|
|
+ unset($v['source']);
|
|
|
$p_code[$v['p_code']][]=$v;
|
|
|
}
|
|
|
|
|
|
@@ -974,16 +989,19 @@ class GetmatchData {
|
|
|
}
|
|
|
//获取赔率数据
|
|
|
$oddsData = lm($model_odds, "Sports")
|
|
|
- ->select( 'id','p_code', 'odds_code','odds_only','status', 'odds', 'condition', 'sort','match_id')
|
|
|
+ ->select( 'id','p_code', 'odds_code','odds_only','status', 'odds', 'condition', 'sort','match_id','source')
|
|
|
->whereIn('match_id', $match_ids)
|
|
|
->where(['status'=>0])
|
|
|
- ->groupBy($model_odds . '.id','p_code', 'odds_code','odds_only', $model_odds . '.status', 'odds', 'condition', 'sort','match_id')
|
|
|
+ ->groupBy($model_odds . '.id','p_code', 'odds_code','odds_only', $model_odds . '.status', 'odds', 'condition', 'sort','match_id','source')
|
|
|
->orderBy($model_odds . '.id','desc')
|
|
|
->get()
|
|
|
->toarray();
|
|
|
foreach ($matchData as $k=>$v){
|
|
|
foreach ($oddsData as $kk=>$vv){
|
|
|
if($v['match_id'] == $vv['match_id']){
|
|
|
+ //获取数据源ID
|
|
|
+ $vv['sourceID'] = $this->commonFunction->getSourceID($vv['source']);
|
|
|
+ unset($vv['source']);
|
|
|
$matchData[$k]['oddsData'][] = $vv;
|
|
|
}
|
|
|
}
|
|
|
@@ -1025,16 +1043,19 @@ class GetmatchData {
|
|
|
|
|
|
$where = $this->commonFunction->getState($type_code,'','zq');
|
|
|
$championData = lm($model_odds, 'Sports')
|
|
|
- ->select("id","lg_id","match_id","p_code","odds_code","team","odds","sort","status","odds_only")
|
|
|
+ ->select("id","lg_id","match_id","p_code","odds_code","team","odds","sort","status","odds_only","source")
|
|
|
->where('lg_id',$lg_id)
|
|
|
->where($where)
|
|
|
->where(['status'=>0])
|
|
|
- ->groupBy("id","lg_id","match_id","p_code","odds_code","team","odds","sort","status","odds_only")
|
|
|
+ ->groupBy("id","lg_id","match_id","p_code","odds_code","team","odds","sort","status","odds_only","source")
|
|
|
->get()->toArray();
|
|
|
|
|
|
//按p_code分组
|
|
|
$p_code=array();
|
|
|
foreach($championData as $k=>$v){
|
|
|
+ //获取数据源ID
|
|
|
+ $v['sourceID'] = $this->commonFunction->getSourceID($v['source']);
|
|
|
+ unset($v['source']);
|
|
|
$p_code[$v['p_code']][]=$v;
|
|
|
}
|
|
|
|