Jonlin 6 سال پیش
والد
کامیت
4a67221cbd

+ 17 - 17
app/Http/Controllers/Admin/SportsBaseController.php

@@ -22,14 +22,14 @@ class SportsBaseController 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\BaseLeague::join('st_bq_local_league','st_bq_league.id','=','st_bq_local_league.lg_id')->select('st_bq_league.id','st_bq_league.name_chinese')->where('st_bq_local_league.source',$source->infocontent)->get();
-        }else{
-            $data = \App\Models\BaseLeague::select('id','name_chinese')->get();
-        }
+//        $source = \App\Models\Setinfo::where('id','1000')->first();
+//        if($source->infocontent != '混合数据'){
+//            $data = \App\Models\BaseLeague::join('st_bq_local_league','st_bq_league.id','=','st_bq_local_league.lg_id')->select('st_bq_league.id','st_bq_league.name_chinese')->where('st_bq_local_league.source',$source->infocontent)->get();
+//        }else{
+//            $data = \App\Models\BaseLeague::select('id','name_chinese')->get();
+//        }
 
-//        $data = \App\Models\BaseLeague::select('id','lg_id','name_chinese')->get();
+        $data = \App\Models\BaseLeague::select('id','lg_id','name_chinese')->get();
         $request['league'] = $data;
         $dt = \App\Lib\DataTable\DataTable::init();
         $dt->setDataSource('/admin/SportsBase/info');
@@ -111,14 +111,14 @@ class SportsBaseController extends Controller {
      */
     function getParent() {
 
-        $source = \App\Models\Setinfo::where('id','1000')->first();
-        if($source->infocontent != '混合数据'){
-            $data = \App\Models\BaseLeague::join('st_bq_local_league','st_bq_league.id','=','st_bq_local_league.lg_id')->select('st_bq_league.id','st_bq_league.name_chinese')->where('st_bq_local_league.source',$source->infocontent)->get();
-        }else{
-            $data = \App\Models\BaseLeague::select('id','name_chinese')->get();
-        }
+//        $source = \App\Models\Setinfo::where('id','1000')->first();
+//        if($source->infocontent != '混合数据'){
+//            $data = \App\Models\BaseLeague::join('st_bq_local_league','st_bq_league.id','=','st_bq_local_league.lg_id')->select('st_bq_league.id','st_bq_league.name_chinese')->where('st_bq_local_league.source',$source->infocontent)->get();
+//        }else{
+//            $data = \App\Models\BaseLeague::select('id','name_chinese')->get();
+//        }
 
-//        $data = \App\Models\BaseLeague::select('id','lg_id','name_chinese')->get();
+        $data = \App\Models\BaseLeague::select('id','lg_id','name_chinese')->get();
         if (!$data) {
             return;
         }
@@ -212,7 +212,7 @@ class SportsBaseController extends Controller {
             if (!$data) {
                 return -2;
             }
-            $name_chinese = \App\Models\BaseLeague::where('id', $data->lg_id)->first();
+            $name_chinese = \App\Models\BaseLeague::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();
@@ -321,12 +321,12 @@ class SportsBaseController 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\SportsBase::where('id',$request['id'])->first();
+        $newapp = \App\Models\SportsBase::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;
 

+ 18 - 18
app/Http/Controllers/Admin/SportsBasketController.php

@@ -22,14 +22,14 @@ class SportsBasketController 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\BasketLeague::join('st_lq_local_league','st_lq_league.id','=','st_lq_local_league.lg_id')->select('st_lq_league.id','st_lq_league.name_chinese')->where('st_lq_local_league.source',$source->infocontent)->get();
-        }else{
-            $data = \App\Models\BasketLeague::select('id','name_chinese')->get();
-        }
-
-//		$data = \App\Models\BasketLeague::select('id','lg_id','name_chinese')->get();
+//        $source = \App\Models\Setinfo::where('id','1000')->first();
+//        if($source->infocontent != '混合数据'){
+//            $data = \App\Models\BasketLeague::join('st_lq_local_league','st_lq_league.id','=','st_lq_local_league.lg_id')->select('st_lq_league.id','st_lq_league.name_chinese')->where('st_lq_local_league.source',$source->infocontent)->get();
+//        }else{
+//            $data = \App\Models\BasketLeague::select('id','name_chinese')->get();
+//        }
+
+		$data = \App\Models\BasketLeague::select('id','lg_id','name_chinese')->get();
 		$request['league'] = $data;
 		$dt = \App\Lib\DataTable\DataTable::init();
 		$dt->setDataSource('/admin/SportsBasket/info');
@@ -113,14 +113,14 @@ class SportsBasketController extends Controller {
 	 */
 	function getParent() {
 
-        $source = \App\Models\Setinfo::where('id','1000')->first();
-        if($source->infocontent != '混合数据'){
-            $data = \App\Models\BasketLeague::join('st_lq_local_league','st_lq_league.id','=','st_lq_local_league.lg_id')->select('st_lq_league.id','st_lq_league.name_chinese')->where('st_lq_local_league.source',$source->infocontent)->get();
-        }else{
-            $data = \App\Models\BasketLeague::select('id','name_chinese')->get();
-        }
+//        $source = \App\Models\Setinfo::where('id','1000')->first();
+//        if($source->infocontent != '混合数据'){
+//            $data = \App\Models\BasketLeague::join('st_lq_local_league','st_lq_league.id','=','st_lq_local_league.lg_id')->select('st_lq_league.id','st_lq_league.name_chinese')->where('st_lq_local_league.source',$source->infocontent)->get();
+//        }else{
+//            $data = \App\Models\BasketLeague::select('id','name_chinese')->get();
+//        }
 
-//		$data = \App\Models\BasketLeague::select('id','lg_id','name_chinese')->get();
+		$data = \App\Models\BasketLeague::select('id','lg_id','name_chinese')->get();
 		if (!$data) {
 			return;
 		}
@@ -214,7 +214,7 @@ class SportsBasketController extends Controller {
 			if (!$data) {
 				return -2;
 			}
-			$name_chinese = \App\Models\BasketLeague::where('id', $data->lg_id)->first();
+			$name_chinese = \App\Models\BasketLeague::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();
@@ -323,12 +323,12 @@ class SportsBasketController 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\SportsBasket::where('id',$request['id'])->first();
+		$newapp = \App\Models\SportsBasket::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\Model\Matchcode::where('p_id','0')->get();

+ 17 - 17
app/Http/Controllers/Admin/SportsTennisController.php

@@ -22,14 +22,14 @@ class SportsTennisController 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\TennisLeague::join('st_wq_local_league','st_wq_league.id','=','st_wq_local_league.lg_id')->select('st_wq_league.id','st_wq_league.name_chinese')->where('st_wq_local_league.source',$source->infocontent)->get();
-        }else{
-            $data = \App\Models\TennisLeague::select('id','name_chinese')->get();
-        }
+//        $source = \App\Models\Setinfo::where('id','1000')->first();
+//        if($source->infocontent != '混合数据'){
+//            $data = \App\Models\TennisLeague::join('st_wq_local_league','st_wq_league.id','=','st_wq_local_league.lg_id')->select('st_wq_league.id','st_wq_league.name_chinese')->where('st_wq_local_league.source',$source->infocontent)->get();
+//        }else{
+//            $data = \App\Models\TennisLeague::select('id','name_chinese')->get();
+//        }
 
-//        $data = \App\Models\TennisLeague::select('id','lg_id','name_chinese')->get();
+        $data = \App\Models\TennisLeague::select('id','lg_id','name_chinese')->get();
         $request['league'] = $data;
         $dt = \App\Lib\DataTable\DataTable::init();
         $dt->setDataSource('/admin/SportsTennis/info');
@@ -112,14 +112,14 @@ class SportsTennisController extends Controller {
      */
     function getParent() {
 
-        $source = \App\Models\Setinfo::where('id','1000')->first();
-        if($source->infocontent != '混合数据'){
-            $data = \App\Models\TennisLeague::join('st_wq_local_league','st_wq_league.id','=','st_wq_local_league.lg_id')->select('st_wq_league.id','st_wq_league.name_chinese')->where('st_wq_local_league.source',$source->infocontent)->get();
-        }else{
-            $data = \App\Models\TennisLeague::select('id','name_chinese')->get();
-        }
+//        $source = \App\Models\Setinfo::where('id','1000')->first();
+//        if($source->infocontent != '混合数据'){
+//            $data = \App\Models\TennisLeague::join('st_wq_local_league','st_wq_league.id','=','st_wq_local_league.lg_id')->select('st_wq_league.id','st_wq_league.name_chinese')->where('st_wq_local_league.source',$source->infocontent)->get();
+//        }else{
+//            $data = \App\Models\TennisLeague::select('id','name_chinese')->get();
+//        }
 
-//        $data = \App\Models\TennisLeague::select('id','lg_id','name_chinese')->get();
+        $data = \App\Models\TennisLeague::select('id','lg_id','name_chinese')->get();
         if (!$data) {
             return;
         }
@@ -213,7 +213,7 @@ class SportsTennisController extends Controller {
             if (!$data) {
                 return -2;
             }
-            $name_chinese = \App\Models\TennisLeague::where('id', $data->lg_id)->first();
+            $name_chinese = \App\Models\TennisLeague::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();
@@ -322,12 +322,12 @@ class SportsTennisController 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\SportsTennis::where('id',$request['id'])->first();
+        $newapp = \App\Models\SportsTennis::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\Model\Matchcode::where('p_id','0')->get();