Pārlūkot izejas kodu

追加赔率所属数据源ID

彭俊 6 gadi atpakaļ
vecāks
revīzija
71e69e9cfd

+ 3 - 0
Application/Sports/Controller/MatchList.php

@@ -630,6 +630,9 @@ where a.match_id = b.match_id and a.id = b.id ";
 
             $list = array();
             foreach ($oddsData as $key=>$item){
+                //获取数据源ID
+                $item['sourceID'] = $this->commonFunction->getSourceID($item['source']);
+                unset($item['source']);
                 //追加所属赔率状态
                 $item['oddsType'] = '';
                 if($oddsType == 'StRollBall'){

+ 1 - 1
Application/Sports/Model/St_zq_odds.php

@@ -66,7 +66,7 @@ class St_zq_odds extends Model
         ];
         $model_odds = $models['model_odds'];
         $oddsData= lm($model_odds,"Sports")
-            ->select($model_odds.'.match_id',$model_odds.'.id','p_code','odds_code',$model_odds.'.status','odds','condition','odds_only','sort')
+            ->select($model_odds.'.match_id',$model_odds.'.id','p_code','odds_code',$model_odds.'.status','odds','condition','odds_only','sort','source')
             ->whereIn($model_odds.'.match_id',$match_ids)
             ->where([$model_odds.'.type'=>0,$model_odds.'.status'=>0])//查询滚球赔率
             ->where($oddsTypeWhere)

+ 16 - 0
Biz/Common/CommonFunction.php

@@ -1311,6 +1311,22 @@ class CommonFunction {
         }
 
     }
+
+    //返回数据源对应ID
+    function getSourceID($source){
+        $data = [
+            'hg3535'=>1,
+            'hg0088'=>2,
+        ];
+
+        if(!empty($data[$source])) {
+            $sourceID = $data[$source];
+        }else{
+            $sourceID = 0;
+        }
+
+        return $sourceID;
+    }
 }
 
 ?>

+ 17 - 4
Biz/Match/GetOddsData.php

@@ -103,7 +103,7 @@ class GetOddsData {
         $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')
+            ->select('match_id','id','p_code','odds_code','status','odds','condition','sort','odds_only','source')
             ->whereIn('match_id',$match_ids)
             ->where(['status'=>0])
             ->where($oddsTypeWhere)
@@ -128,6 +128,9 @@ class GetOddsData {
             $odds = [];
             foreach ($oddsData as $kkk=>$vvv) {
                 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;
                     }
@@ -175,7 +178,7 @@ class GetOddsData {
         $DefaultOdds = $get_DefaultOdds['Other']['lq'];
 
         $oddsData = lm($model_odds, 'Sports')
-            ->select('match_id','id','p_code','odds_code','status','odds','condition','sort','odds_only')
+            ->select('match_id','id','p_code','odds_code','status','odds','condition','sort','odds_only','source')
             ->whereIn('match_id',$match_ids)
             ->where(['status'=>0])
             ->where($oddsTypeWhere)
@@ -199,7 +202,11 @@ class GetOddsData {
             //获取赛事下赔率并且分组
             $odds = [];
             foreach ($oddsData as $kkk=>$vvv) {
+                
                 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_guest']){
                         $concede_g = $vvv;
                     }
@@ -247,7 +254,7 @@ class GetOddsData {
         $DefaultOdds = $get_DefaultOdds['Other']['wq'];
 
         $oddsData = lm($model_odds, 'Sports')
-            ->select('match_id','id','p_code','odds_code','status','odds','condition','sort','odds_only')
+            ->select('match_id','id','p_code','odds_code','status','odds','condition','sort','odds_only','source')
             ->whereIn('match_id',$match_ids)
             ->where(['status'=>0])
             ->where($oddsTypeWhere)
@@ -272,6 +279,9 @@ class GetOddsData {
             $odds = [];
             foreach ($oddsData as $kkk=>$vvv) {
                 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_guest']){
                         $concede_g = $vvv;
                     }
@@ -319,7 +329,7 @@ class GetOddsData {
         $DefaultOdds = $get_DefaultOdds['Other']['bq'];
 
         $oddsData = lm($model_odds, 'Sports')
-            ->select('match_id','id','p_code','odds_code','status','odds','condition','sort','odds_only')
+            ->select('match_id','id','p_code','odds_code','status','odds','condition','sort','odds_only','source')
             ->whereIn('match_id',$match_ids)
             ->where(['status'=>0])
             ->where($oddsTypeWhere)
@@ -338,6 +348,9 @@ class GetOddsData {
             $odds = [];
             foreach ($oddsData as $kkk=>$vvv) {
                 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_capot_home']){
                         $concede_g = $vvv;
                     }

+ 28 - 7
Biz/Match/GetmatchData.php

@@ -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;
         }