1

app/Http/Controllers/Admin/SportsSoccerController.php

@@ -22,14 +22,14 @@ class SportsSoccerController extends Controller {
         $request['status'] = isset($req->status) ? trim($req->status) : '-1';
         $request['sureblurs'] = isset($req->sureblurs) ? $req->sureblurs : 'on';
 
-        $source = \App\Models\Setinfo::where('id','1000')->first();
-        if($source->infocontent != '混合数据'){
-            $data = \App\Models\SoccerLeague::join('st_zq_local_league','st_zq_league.id','=','st_zq_local_league.lg_id')->select('st_zq_league.id','st_zq_league.name_chinese')->where('st_zq_local_league.source',$source->infocontent)->get();
-        }else{
-            $data = \App\Models\SoccerLeague::select('id','name_chinese')->get();
-        }
+//        $source = \App\Models\Setinfo::where('id','1000')->first();
+//        if($source->infocontent != '混合数据'){
+//            $data = \App\Models\SoccerLeague::join('st_zq_local_league','st_zq_league.id','=','st_zq_local_league.lg_id')->select('st_zq_league.id','st_zq_league.name_chinese')->where('st_zq_local_league.source',$source->infocontent)->get();
+//        }else{
+//            $data = \App\Models\SoccerLeague::select('id','name_chinese')->get();
+//        }
 
-//        $data = \App\Models\SoccerLeague::select('id','lg_id','name_chinese')->get();
+        $data = \App\Models\SoccerLeague::select('id','lg_id','name_chinese')->get();
 
         $request['league'] = $data;
         $dt = \App\Lib\DataTable\DataTable::init();
@@ -109,14 +109,14 @@ class SportsSoccerController extends Controller {
      *获取所有足球联赛信息
      */
     function getParent() {
-        $source = \App\Models\Setinfo::where('id','1000')->first();
-        if($source->infocontent != '混合数据'){
-            $data = \App\Models\SoccerLeague::join('st_zq_local_league','st_zq_league.id','=','st_zq_local_league.lg_id')->select('st_zq_league.id','st_zq_league.name_chinese')->where('st_zq_local_league.source',$source->infocontent)->get();
-        }else{
-            $data = \App\Models\SoccerLeague::select('id','name_chinese')->get();
-        }
+//        $source = \App\Models\Setinfo::where('id','1000')->first();
+//        if($source->infocontent != '混合数据'){
+//            $data = \App\Models\SoccerLeague::join('st_zq_local_league','st_zq_league.id','=','st_zq_local_league.lg_id')->select('st_zq_league.id','st_zq_league.name_chinese')->where('st_zq_local_league.source',$source->infocontent)->get();
+//        }else{
+//            $data = \App\Models\SoccerLeague::select('id','name_chinese')->get();
+//        }
 
-//        $data = \App\Models\SoccerLeague::select('id','lg_id','name_chinese')->get();
+        $data = \App\Models\SoccerLeague::select('id','lg_id','name_chinese')->get();
 
         if (!$data) {
             return;
@@ -211,7 +211,8 @@ class SportsSoccerController extends Controller {
             if (!$data) {
                 return -2;
             }
-            $name_chinese = \App\Models\SoccerLeague::where('id', $data->lg_id)->first();
+            //$name_chinese = \App\Models\SoccerLeague::where('id', $data->lg_id)->first();
+            $name_chinese = \App\Models\SoccerLeague::where('lg_id', $data->lg_id)->first();
 //            $home_team = \App\Model\Team::where('team_name_cn', $data->home_team)->first();
 //            $guest_team = \App\Model\Team::where('team_name_cn', $data->guest_team)->first();
 //            $home_country = \App\Model\Country::where('country_id', $home_team->country_id)->first();
@@ -320,12 +321,12 @@ class SportsSoccerController extends Controller {
         $request['status'] = isset($req->status) ? trim($req->status) : '-1';
         $request['p_code'] = isset($req->p_code) ? trim($req->p_code) : '-1';
         $request['id'] = isset($req->id) ? trim($req->id) : null;
-        $newapp = \App\Models\SportsSoccer::where('id',$request['id'])->first();
+        $newapp = \App\Models\SportsSoccer::where('match_id',$request['id'])->first();
        // $match_id = $newapp->match_id;
         if(empty($newapp)){
             $match_id = $req->input('id');
         }else{
-            $match_id = $newapp->id;
+            $match_id = $newapp->match_id;
         }
         $request['match_id'] = isset($match_id) ? trim($match_id) : null;
         $data = \App\Models\Matchcode::where('p_id','0')->where('game_code','zq')->get();

app/Models/SportsSoccer.php

@@ -49,49 +49,49 @@ class SportsSoccer extends BaseModel {
         
         $where[] = array('st_zq_league.name_chinese','<>','');
 
-        $source = \App\Models\Setinfo::where('id','1000')->first();
-        if($source->infocontent != '混合数据'){
-            $where[] = array('st_zq_local_match.source', '=', $source->infocontent);
-            $where[] = array('st_zq_local_league.source', '=', $source->infocontent);
-        }
-        if (is_array ($where) && count ($where) > 0) {
-            $data = $this->join('st_zq_league','st_zq_competition.lg_id','=','st_zq_league.id')
-                ->join('st_zq_local_match','st_zq_competition.id','=','st_zq_local_match.match_id')
-                ->join('st_zq_local_league','st_zq_league.id','=','st_zq_local_league.lg_id')
-                ->select('st_zq_competition.id','st_zq_local_match.match_id','st_zq_local_league.lg_id','st_zq_league.name_chinese','st_zq_league.last_time','st_zq_competition.home_team','st_zq_competition.guest_team','st_zq_competition.match_date','st_zq_competition.match_time','st_zq_competition.status','st_zq_competition.recommend')
-                ->orderby('st_zq_competition.match_date','desc')
-                ->orderby('st_zq_competition.match_time','desc')
-                ->where($where)
-                ->orwhere($orwhere)
-                ->paginate ($list);
-        } else {
-            $data = $this->join('st_zq_league','st_zq_competition.lg_id','=','st_zq_league.id')
-                ->join('st_zq_local_match','st_zq_competition.id','=','st_zq_local_match.match_id')
-                ->join('st_zq_local_league','st_zq_league.id','=','st_zq_local_league.lg_id')
-                ->select('st_zq_competition.id','st_zq_local_match.match_id','st_zq_local_league.lg_id','st_zq_league.name_chinese','st_zq_league.last_time','st_zq_competition.home_team','st_zq_competition.guest_team','st_zq_competition.match_date','st_zq_competition.match_time','st_zq_competition.status','st_zq_competition.recommend')
-                ->orderby('st_zq_competition.match_date','desc')
-                ->orderby('st_zq_competition.match_time','desc')
-                ->paginate ($list);
-        }
-
-
-
+//        $source = \App\Models\Setinfo::where('id','1000')->first();
+//        if($source->infocontent != '混合数据'){
+//            $where[] = array('st_zq_local_match.source', '=', $source->infocontent);
+//            $where[] = array('st_zq_local_league.source', '=', $source->infocontent);
+//        }
 //        if (is_array ($where) && count ($where) > 0) {
-//            $data = $this->join('st_zq_league','st_zq_competition.lg_id','=','st_zq_league.lg_id')
-//                ->select('st_zq_competition.id','st_zq_competition.match_id','st_zq_competition.lg_id','st_zq_league.name_chinese','st_zq_league.last_time','st_zq_competition.home_team','st_zq_competition.guest_team','st_zq_competition.match_date','st_zq_competition.match_time','st_zq_competition.status','st_zq_competition.recommend')
+//            $data = $this->join('st_zq_league','st_zq_competition.lg_id','=','st_zq_league.id')
+//                ->join('st_zq_local_match','st_zq_competition.id','=','st_zq_local_match.match_id')
+//                ->join('st_zq_local_league','st_zq_league.id','=','st_zq_local_league.lg_id')
+//                ->select('st_zq_competition.id','st_zq_local_match.match_id','st_zq_local_league.lg_id','st_zq_league.name_chinese','st_zq_league.last_time','st_zq_competition.home_team','st_zq_competition.guest_team','st_zq_competition.match_date','st_zq_competition.match_time','st_zq_competition.status','st_zq_competition.recommend')
 //                ->orderby('st_zq_competition.match_date','desc')
 //                ->orderby('st_zq_competition.match_time','desc')
 //                ->where($where)
 //                ->orwhere($orwhere)
 //                ->paginate ($list);
 //        } else {
-//            $data = $this->join('st_zq_league','st_zq_competition.lg_id','=','st_zq_league.lg_id')
-//                ->select('st_zq_competition.id','st_zq_competition.match_id','st_zq_competition.lg_id','st_zq_league.name_chinese','st_zq_league.last_time','st_zq_competition.home_team','st_zq_competition.guest_team','st_zq_competition.match_date','st_zq_competition.match_time','st_zq_competition.status','st_zq_competition.recommend')
+//            $data = $this->join('st_zq_league','st_zq_competition.lg_id','=','st_zq_league.id')
+//                ->join('st_zq_local_match','st_zq_competition.id','=','st_zq_local_match.match_id')
+//                ->join('st_zq_local_league','st_zq_league.id','=','st_zq_local_league.lg_id')
+//                ->select('st_zq_competition.id','st_zq_local_match.match_id','st_zq_local_league.lg_id','st_zq_league.name_chinese','st_zq_league.last_time','st_zq_competition.home_team','st_zq_competition.guest_team','st_zq_competition.match_date','st_zq_competition.match_time','st_zq_competition.status','st_zq_competition.recommend')
 //                ->orderby('st_zq_competition.match_date','desc')
 //                ->orderby('st_zq_competition.match_time','desc')
 //                ->paginate ($list);
 //        }
 
+
+
+        if (is_array ($where) && count ($where) > 0) {
+            $data = $this->join('st_zq_league','st_zq_competition.lg_id','=','st_zq_league.lg_id')
+                ->select('st_zq_competition.id','st_zq_competition.match_id','st_zq_competition.lg_id','st_zq_league.name_chinese','st_zq_league.last_time','st_zq_competition.home_team','st_zq_competition.guest_team','st_zq_competition.match_date','st_zq_competition.match_time','st_zq_competition.status','st_zq_competition.recommend')
+                ->orderby('st_zq_competition.match_date','desc')
+                ->orderby('st_zq_competition.match_time','desc')
+                ->where($where)
+                ->orwhere($orwhere)
+                ->paginate ($list);
+        } else {
+            $data = $this->join('st_zq_league','st_zq_competition.lg_id','=','st_zq_league.lg_id')
+                ->select('st_zq_competition.id','st_zq_competition.match_id','st_zq_competition.lg_id','st_zq_league.name_chinese','st_zq_league.last_time','st_zq_competition.home_team','st_zq_competition.guest_team','st_zq_competition.match_date','st_zq_competition.match_time','st_zq_competition.status','st_zq_competition.recommend')
+                ->orderby('st_zq_competition.match_date','desc')
+                ->orderby('st_zq_competition.match_time','desc')
+                ->paginate ($list);
+        }
+
         if (!$data < 0) {
             return -2021052003; //
         }