结算处理 6/11

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\Model\Setinfo::where('id','1000')->first();
-//        if($source->infocontent != '混合数据'){
-//            $data = \App\Model\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\Model\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\Model\Setinfo::where('id','1000')->first();
-//        if($source->infocontent != '混合数据'){
-//            $data = \App\Model\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\Model\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('lg_id', $data->lg_id)->first();
+            $name_chinese = \App\Models\BaseLeague::where('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();
@@ -324,9 +324,9 @@ class SportsBaseController extends Controller {
         $newapp = \App\Models\SportsBase::where('id',$request['id'])->first();
         // $match_id = $newapp->match_id;
         if(empty($newapp)){
-            $match_id = $req->input('cp_id');
+            $match_id = $req->input('id');
         }else{
-            $match_id = $newapp->match_id;
+            $match_id = $newapp->id;
         }
         $request['match_id'] = isset($match_id) ? trim($match_id) : null;
 

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\Model\Setinfo::where('id','1000')->first();
-//        if($source->infocontent != '混合数据'){
-//            $data = \App\Model\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\Model\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\Model\Setinfo::where('id','1000')->first();
-//        if($source->infocontent != '混合数据'){
-//            $data = \App\Model\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\Model\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('lg_id', $data->lg_id)->first();
+			$name_chinese = \App\Models\BasketLeague::where('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();
@@ -326,9 +326,9 @@ class SportsBasketController extends Controller {
 		$newapp = \App\Models\SportsBasket::where('id',$request['id'])->first();
 		// $match_id = $newapp->match_id;
 		if(empty($newapp)){
-			$match_id = $req->input('cp_id');
+			$match_id = $req->input('id');
 		}else{
-			$match_id = $newapp->match_id;
+			$match_id = $newapp->id;
 		}
 		$request['match_id'] = isset($match_id) ? trim($match_id) : null;
 		//$data = \App\Model\Matchcode::where('p_id','0')->get();

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\Model\Setinfo::where('id','1000')->first();
-//        if($source->infocontent != '混合数据'){
-//            $data = \App\Model\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\Model\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\Model\Setinfo::where('id','1000')->first();
-//        if($source->infocontent != '混合数据'){
-//            $data = \App\Model\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\Model\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,7 @@ class SportsSoccerController extends Controller {
             if (!$data) {
                 return -2;
             }
-            $name_chinese = \App\Models\SoccerLeague::where('lg_id', $data->lg_id)->first();
+            $name_chinese = \App\Models\SoccerLeague::where('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();
@@ -236,7 +236,7 @@ class SportsSoccerController extends Controller {
             return view('sports.soccer_form', $data);
         } else {
             $model = new \App\Models\SportsSoccer();
-            $model->id = $req->input('lg_id');
+            $model->id = $req->input('id');
             $model = $model::find($model->id);
             $model->home_team = $req->input('home_team');
             $model->guest_team = $req->input('guest_team');
@@ -323,9 +323,9 @@ class SportsSoccerController extends Controller {
         $newapp = \App\Models\SportsSoccer::where('id',$request['id'])->first();
        // $match_id = $newapp->match_id;
         if(empty($newapp)){
-            $match_id = $req->input('cp_id');
+            $match_id = $req->input('id');
         }else{
-            $match_id = $newapp->match_id;
+            $match_id = $newapp->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/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\Model\Setinfo::where('id','1000')->first();
-//        if($source->infocontent != '混合数据'){
-//            $data = \App\Model\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\Model\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\Model\Setinfo::where('id','1000')->first();
-//        if($source->infocontent != '混合数据'){
-//            $data = \App\Model\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\Model\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('lg_id', $data->lg_id)->first();
+            $name_chinese = \App\Models\TennisLeague::where('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();
@@ -325,9 +325,9 @@ class SportsTennisController extends Controller {
         $newapp = \App\Models\SportsTennis::where('id',$request['id'])->first();
         // $match_id = $newapp->match_id;
         if(empty($newapp)){
-            $match_id = $req->input('cp_id');
+            $match_id = $req->input('id');
         }else{
-            $match_id = $newapp->match_id;
+            $match_id = $newapp->id;
         }
         $request['match_id'] = isset($match_id) ? trim($match_id) : null;
         //$data = \App\Model\Matchcode::where('p_id','0')->get();

app/Lib/Settlement/Adapter/RulePlus.php

@@ -281,22 +281,32 @@ trait RulePlus
         $arr = $this->lq_getResultBySn($recoreModesArray);
         $return = [
             'list' => $arr,
-            'all' => ['home' => 0, 'guest' => 0],
-            'half' => ['home' => 0, 'guest' => 0],
-            'half2' => ['home' => 0, 'guest' => 0],
+            'all' => ['home' => 0, 'guest' => 0, 'home_rate' => 0, 'guest_rate' => 0],
+            'half' => ['home' => 0, 'guest' => 0, 'home_rate' => 0, 'guest_rate' => 0],
+            'half2' => ['home' => 0, 'guest' => 0, 'home_rate' => 0, 'guest_rate' => 0],
         ];
 
         foreach ($arr as $key => $val) {
             $tmp_home = intval($val->home);
             $tmp_guest = intval($val->guest);
+            $tmp_home_rate = intval($val->home_rate);
+            $tmp_guest_rate = intval($val->guest_rate);
+
             $return['all']['home'] += $tmp_guest;
             $return['all']['guest'] += $tmp_home;
+            $return['all']['home_rate'] += $tmp_home_rate;
+            $return['all']['guest_rate'] += $tmp_guest_rate;
+
             if ($key == 1 || $key == 2) {
                 $return['half']['home'] += $tmp_home;
                 $return['half']['guest'] += $tmp_guest;
+                $return['half']['home_rate'] += $tmp_home_rate;
+                $return['half']['guest_rate'] += $tmp_guest_rate;
             } else {
                 $return['half2']['home'] += $tmp_home;
                 $return['half2']['guest'] += $tmp_guest;
+                $return['half2']['home_rate'] += $tmp_home_rate;
+                $return['half2']['guest_rate'] += $tmp_guest_rate;
             }
         }
         return $return;

app/Models/BaseLeague.php

@@ -12,13 +12,19 @@ class BaseLeague extends BaseModel {
 
     function getinfo($list = 10, $page, $where = '')
     {
+        $source = \App\Models\Setinfo::where('id','1000')->first();
+        if($source->infocontent != '混合数据'){
+            $where[] = array('st_bq_local_league.source', '=', $source->infocontent);
+        }
         if (is_array ($where) && count ($where) > 0){
             $data = $this
+                ->join('st_bq_local_league','st_bq_league.id','=','st_bq_local_league.lg_id')
                 ->orderby('utime','desc')
                 ->where($where)
                 ->paginate ($list);
         }else{
             $data = $this
+                ->join('st_bq_local_league','st_bq_league.id','=','st_bq_local_league.lg_id')
                 ->orderby('utime','desc')
                 ->paginate ($list);
         }

app/Models/BasketLeague.php

@@ -14,13 +14,19 @@ class BasketLeague extends BaseModel {
 
     function getinfo($list = 10, $page, $where = '')
     {
+        $source = \App\Models\Setinfo::where('id','1000')->first();
+        if($source->infocontent != '混合数据'){
+            $where[] = array('st_lq_local_league.source', '=', $source->infocontent);
+        }
         if (is_array ($where) && count ($where) > 0){
             $data = $this
+                ->join('st_lq_local_league','st_lq_league.id','=','st_lq_local_league.lg_id')
                 ->orderby('utime','desc')
                 ->where($where)
                 ->paginate ($list);
         }else{
             $data = $this
+                ->join('st_lq_local_league','st_lq_league.id','=','st_lq_local_league.lg_id')
                 ->orderby('utime','desc')
                 ->paginate ($list);
         }

app/Models/MoneyBuyStr.php

@@ -154,7 +154,7 @@ class MoneyBuyStr extends BaseModel {
                 $data[$i]->condition = '';
             }
             
-            $league = DB::table('st_'.$data[$i]->game_code.'_league')->join('st_'.$data[$i]->game_code.'_competition','st_'.$data[$i]->game_code.'_competition.lg_id','=','st_'.$data[$i]->game_code.'_league.lg_id')->where('st_'.$data[$i]->game_code.'_league.lg_id',$data[$i]->lg_id)->where('st_'.$data[$i]->game_code.'_competition.match_id',$data[$i]->match_id)->first();
+            $league = DB::table('st_'.$data[$i]->game_code.'_league')->join('st_'.$data[$i]->game_code.'_competition','st_'.$data[$i]->game_code.'_competition.lg_id','=','st_'.$data[$i]->game_code.'_league.id')->where('st_'.$data[$i]->game_code.'_league.id',$data[$i]->lg_id)->where('st_'.$data[$i]->game_code.'_competition.id',$data[$i]->match_id)->first();
             if(!empty($league)){
                 //联赛名称
                 $data[$i]->league = $league->name_chinese;

app/Models/SoccerLeague.php

@@ -14,13 +14,19 @@ class SoccerLeague extends BaseModel {
 
     function getinfo($list = 10, $page, $where = '')
     {
+        $source = \App\Models\Setinfo::where('id','1000')->first();
+        if($source->infocontent != '混合数据'){
+            $where[] = array('st_zq_local_league.source', '=', $source->infocontent);
+        }
         if (is_array ($where) && count ($where) > 0){
             $data = $this
+                ->join('st_zq_local_league','st_zq_league.id','=','st_zq_local_league.lg_id')
                 ->orderby('utime','desc')
                 ->where($where)
                 ->paginate ($list);
         }else{
             $data = $this
+                ->join('st_zq_local_league','st_zq_league.id','=','st_zq_local_league.lg_id')
                 ->orderby('utime','desc')
                 ->paginate ($list);
         }

app/Models/SportsBase.php

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

app/Models/SportsBasket.php

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

app/Models/SportsNoteList.php

@@ -15,8 +15,8 @@ class SportsNoteList extends BaseModel {
     {
         $data = $this
             ->join('money_details','money_details.info_identity','=','money_buy_simplex.info_identity')
-            ->join('st_'.$type.'_competition','st_'.$type.'_competition.match_id','=','money_buy_simplex.match_id')
-            ->join('st_'.$type.'_league','st_'.$type.'_competition.lg_id','=','st_'.$type.'_league.lg_id')
+            ->join('st_'.$type.'_competition','st_'.$type.'_competition.id','=','money_buy_simplex.match_id')
+            ->join('st_'.$type.'_league','st_'.$type.'_competition.lg_id','=','st_'.$type.'_league.id')
             ->select('money_buy_simplex.id','money_buy_simplex.account_name','money_buy_simplex.account_identity','money_buy_simplex.order_id','money_buy_simplex.money','money_buy_simplex.prize_money','money_buy_simplex.status','money_buy_simplex.money_time','money_buy_simplex.settle_status','money_buy_simplex.gain_money','money_buy_simplex.game_code','money_buy_simplex.match_id','money_buy_simplex.game_status','st_'.$type.'_competition.home_team','st_'.$type.'_competition.guest_team','st_'.$type.'_competition.match_date','st_'.$type.'_competition.match_time','st_'.$type.'_competition.lg_id','money_details.money_cash','money_buy_simplex.batch_id','st_'.$type.'_league.name_chinese','st_'.$type.'_league.last_time')
             ->where($where)
             ->orderby('money_buy_simplex.money_time','desc')
@@ -185,15 +185,15 @@ class SportsNoteList extends BaseModel {
         $data['all_money'] = 0;
         $data['all_prize_money'] = 0;
         $data['alraedy_prize_money'] = 0;
-        $all_money = $this->join('money_details','money_details.info_identity','=','money_buy_simplex.info_identity')->join('st_'.$type.'_competition','st_'.$type.'_competition.match_id','=','money_buy_simplex.match_id')->join('st_'.$type.'_league','st_'.$type.'_competition.lg_id','=','st_'.$type.'_league.lg_id')->select('money_buy_simplex.money','money_buy_simplex.prize_money','money_buy_simplex.gain_money')->where('money_buy_simplex.status','1')->get();
+        $all_money = $this->join('money_details','money_details.info_identity','=','money_buy_simplex.info_identity')->join('st_'.$type.'_competition','st_'.$type.'_competition.id','=','money_buy_simplex.match_id')->join('st_'.$type.'_league','st_'.$type.'_competition.lg_id','=','st_'.$type.'_league.id')->select('money_buy_simplex.money','money_buy_simplex.prize_money','money_buy_simplex.gain_money')->where('money_buy_simplex.status','1')->get();
         for($a=0;$a<count($all_money);$a++){
             $data['all_money'] = $data['all_money']+$all_money[$a]->money;
         }
-        $all_prize_money = $this->join('money_details','money_details.info_identity','=','money_buy_simplex.info_identity')->join('st_'.$type.'_competition','st_'.$type.'_competition.match_id','=','money_buy_simplex.match_id')->join('st_'.$type.'_league','st_'.$type.'_competition.lg_id','=','st_'.$type.'_league.lg_id')->select('money_buy_simplex.money','money_buy_simplex.prize_money','money_buy_simplex.gain_money')->where('money_buy_simplex.status','1')->get();
+        $all_prize_money = $this->join('money_details','money_details.info_identity','=','money_buy_simplex.info_identity')->join('st_'.$type.'_competition','st_'.$type.'_competition.id','=','money_buy_simplex.match_id')->join('st_'.$type.'_league','st_'.$type.'_competition.lg_id','=','st_'.$type.'_league.id')->select('money_buy_simplex.money','money_buy_simplex.prize_money','money_buy_simplex.gain_money')->where('money_buy_simplex.status','1')->get();
         for($a=0;$a<count($all_prize_money);$a++){
             $data['all_prize_money'] = $data['all_money']+$all_prize_money[$a]->prize_money;
         }
-        $alraedy_prize_money = $this->join('money_details','money_details.info_identity','=','money_buy_simplex.info_identity')->join('st_'.$type.'_competition','st_'.$type.'_competition.match_id','=','money_buy_simplex.match_id')->join('st_'.$type.'_league','st_'.$type.'_competition.lg_id','=','st_'.$type.'_league.lg_id')->select('money_buy_simplex.money','money_buy_simplex.prize_money','money_buy_simplex.gain_money')->where('money_buy_simplex.settle_status','2')->where('money_buy_simplex.status','1')->get();
+        $alraedy_prize_money = $this->join('money_details','money_details.info_identity','=','money_buy_simplex.info_identity')->join('st_'.$type.'_competition','st_'.$type.'_competition.id','=','money_buy_simplex.match_id')->join('st_'.$type.'_league','st_'.$type.'_competition.lg_id','=','st_'.$type.'_league.id')->select('money_buy_simplex.money','money_buy_simplex.prize_money','money_buy_simplex.gain_money')->where('money_buy_simplex.settle_status','2')->where('money_buy_simplex.status','1')->get();
         for($a=0;$a<count($alraedy_prize_money);$a++){
             $data['alraedy_prize_money'] = $data['all_money']+$alraedy_prize_money[$a]->gain_money;
         }
@@ -205,15 +205,15 @@ class SportsNoteList extends BaseModel {
             //$data['all_money'] = $this->where($where)->sum('money');
 //            $data['all_prize_money'] = $this->where($where)->sum('prize_money');
 //            $data['alraedy_prize_money'] = $this->where($where)->where('settle_status','2')->sum('gain_money');
-            $all_money = $this->join('money_details','money_details.info_identity','=','money_buy_simplex.info_identity')->join('st_zq_competition','st_zq_competition.match_id','=','money_buy_simplex.match_id')->join('st_zq_league','st_zq_competition.lg_id','=','st_zq_league.lg_id')->select('money_buy_simplex.money','money_buy_simplex.prize_money','money_buy_simplex.gain_money')->where($where)->where('money_buy_simplex.status','1')->get();
+            $all_money = $this->join('money_details','money_details.info_identity','=','money_buy_simplex.info_identity')->join('st_zq_competition','st_zq_competition.id','=','money_buy_simplex.match_id')->join('st_zq_league','st_zq_competition.lg_id','=','st_zq_league.id')->select('money_buy_simplex.money','money_buy_simplex.prize_money','money_buy_simplex.gain_money')->where($where)->where('money_buy_simplex.status','1')->get();
             for($a=0;$a<count($all_money);$a++){
                 $data['all_money'] = $data['all_money']+$all_money[$a]->money;
             }
-            $all_prize_money = $this->join('money_details','money_details.info_identity','=','money_buy_simplex.info_identity')->join('st_'.$type.'_competition','st_'.$type.'_competition.match_id','=','money_buy_simplex.match_id')->join('st_'.$type.'_league','st_'.$type.'_competition.lg_id','=','st_'.$type.'_league.lg_id')->select('money_buy_simplex.money','money_buy_simplex.prize_money','money_buy_simplex.gain_money')->where($where)->where('money_buy_simplex.status','1')->get();
+            $all_prize_money = $this->join('money_details','money_details.info_identity','=','money_buy_simplex.info_identity')->join('st_'.$type.'_competition','st_'.$type.'_competition.id','=','money_buy_simplex.match_id')->join('st_'.$type.'_league','st_'.$type.'_competition.lg_id','=','st_'.$type.'_league.id')->select('money_buy_simplex.money','money_buy_simplex.prize_money','money_buy_simplex.gain_money')->where($where)->where('money_buy_simplex.status','1')->get();
             for($a=0;$a<count($all_prize_money);$a++){
                 $data['all_prize_money'] = $data['all_prize_money']+$all_prize_money[$a]->prize_money;
             }
-            $alraedy_prize_money = $this->join('money_details','money_details.info_identity','=','money_buy_simplex.info_identity')->join('st_'.$type.'_competition','st_'.$type.'_competition.match_id','=','money_buy_simplex.match_id')->join('st_'.$type.'_league','st_'.$type.'_competition.lg_id','=','st_'.$type.'_league.lg_id')->select('money_buy_simplex.money','money_buy_simplex.prize_money','money_buy_simplex.gain_money')->where('money_buy_simplex.settle_status','2')->where($where)->where('money_buy_simplex.status','1')->get();
+            $alraedy_prize_money = $this->join('money_details','money_details.info_identity','=','money_buy_simplex.info_identity')->join('st_'.$type.'_competition','st_'.$type.'_competition.id','=','money_buy_simplex.match_id')->join('st_'.$type.'_league','st_'.$type.'_competition.lg_id','=','st_'.$type.'_league.id')->select('money_buy_simplex.money','money_buy_simplex.prize_money','money_buy_simplex.gain_money')->where('money_buy_simplex.settle_status','2')->where($where)->where('money_buy_simplex.status','1')->get();
             for($a=0;$a<count($alraedy_prize_money);$a++){
                 $data['alraedy_prize_money'] = $data['alraedy_prize_money']+$alraedy_prize_money[$a]->gain_money;
             }

app/Models/SportsTennis.php

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

app/Models/TennisLeague.php

@@ -14,13 +14,19 @@ class TennisLeague extends BaseModel {
 
     function getinfo($list = 10, $page, $where = '')
     {
+        $source = \App\Models\Setinfo::where('id','1000')->first();
+        if($source->infocontent != '混合数据'){
+            $where[] = array('st_wq_local_league.source', '=', $source->infocontent);
+        }
         if (is_array ($where) && count ($where) > 0){
             $data = $this
+                ->join('st_wq_local_league','st_wq_league.id','=','st_wq_local_league.lg_id')
                 ->orderby('utime','desc')
                 ->where($where)
                 ->paginate ($list);
         }else{
             $data = $this
+                ->join('st_wq_local_league','st_wq_league.id','=','st_wq_local_league.lg_id')
                 ->orderby('utime','desc')
                 ->paginate ($list);
         }

resources/lang/zh-cn/sportssoccer.php

@@ -26,6 +26,7 @@ return array(
 
     'p_code_search' => '父级赔率代码查询',
     'league_status_search' => '联赛状态查询',
+    'odds_status_search' => '赔率状态查询',
 
 
 

resources/views/sports/base_form.blade.php

@@ -2,6 +2,12 @@
 @section('content')
     <form class="layui-form" action="{{ url()->full() }}" id="submitForm" name="submitForm" method="post" eventType=eventAjaxForm>
         {!! csrf_field() !!}
+        <div class="layui-form-item" >
+            <label class="layui-form-label">赛事id</label>
+            <div class="layui-input-block">
+                <input type="text" name="id" required  lay-verify="required" placeholder="" autocomplete="off" value="{{ isset($id)?$id:'' }}" class="layui-input">
+            </div>
+        </div>
         <div class="layui-form-item">
             <label class="layui-form-label">主队名称</label>
             <div class="layui-input-block">
@@ -70,7 +76,7 @@
                     <option value></option>
                     @if(isset($parents))
                         @foreach($parents as $k=>$v)
-                            <option value="{{ $v['lg_id'] }}"  @if(isset($lg_id)&&$lg_id==$v['lg_id'])  selected @endif>
+                            <option value="{{ $v['id'] }}"  @if(isset($lg_id)&&$lg_id==$v['id'])  selected @endif>
                                 @if(isset($lange[$v['name_chinese']]))  {{$lange[trim($v['name_chinese'])]}} @else {{$v['name_chinese']}}   @endif
                             </option>
                         @endforeach

resources/views/sports/base_odds.blade.php

@@ -39,7 +39,7 @@
                     <div class="layui-inline">
                         <label class="layui-form-label">{{ trans('sportssoccer.match_id') }}</label>
                         <div class="layui-input-inline">
-                            <input type="text" name="cp_id" id="cp_id" eventType="event-query"  value="{{ $match_id }}" lay-verify="required" autocomplete="off" class="layui-input" readonly="readonly">
+                            <input type="text" name="id" id="id" eventType="event-query"  value="{{ $id }}" lay-verify="required" autocomplete="off" class="layui-input" readonly="readonly">
                         </div>
                         {{--<div class="layui-input-inline checkbox">--}}
                         {{--<input type="checkbox" name="sureblur" id="sureblur" lay-skin="switch" lay-text="精确|模糊" checked>--}}
@@ -83,7 +83,7 @@
                         <a class="layui-btn layui-btn-sm lay-btn-diy"   data-type="reload" eventType="event-query-submit" style="opacity: 1; pointer-events: auto;">提交</a>
                         <a  class="layui-btn   layui-btn-sm layui-btn-normal reset" data-type="reload" style="opacity: 1; pointer-events: auto;">重置</a>
                         <a class="layui-btn layui-btn-sm layui-btn-green set" data-type="reload" style="opacity: 1; pointer-events: auto;"><i class="layui-icon">ဂ</i></a>
-                        @if(checkRriv('/admin/SportsBase/addodds'))<a href="/admin/SportsBase/addodds?{{ $match_id }}" class="layui-btn layui-btn-sm ">添加</a>@endif
+                        @if(checkRriv('/admin/SportsBase/addodds'))<a href="/admin/SportsBase/addodds?{{ $id }}" class="layui-btn layui-btn-sm ">添加</a>@endif
                         @if(checkRriv('/admin/SportsBase/oddsdelete'))<a href="javascript:delWin('/admin/SportsBase/oddsdelete?id=');" class="layui-btn layui-btn-sm  layui-btn-danger">删除</a>@endif
                     </div>
 

resources/views/sports/basket_form.blade.php

@@ -2,6 +2,12 @@
 @section('content')
     <form class="layui-form" action="{{ url()->full() }}" id="submitForm" name="submitForm" method="post" eventType=eventAjaxForm>
         {!! csrf_field() !!}
+        <div class="layui-form-item" >
+            <label class="layui-form-label">赛事id</label>
+            <div class="layui-input-block">
+                <input type="text" name="id" required  lay-verify="required" placeholder="" autocomplete="off" value="{{ isset($id)?$id:'' }}" class="layui-input">
+            </div>
+        </div>
         <div class="layui-form-item">
             <label class="layui-form-label">主队名称</label>
             <div class="layui-input-block">
@@ -70,7 +76,7 @@
                     <option value></option>
                     @if(isset($parents))
                         @foreach($parents as $k=>$v)
-                            <option value="{{ $v['lg_id'] }}"  @if(isset($lg_id)&&$lg_id==$v['lg_id'])  selected @endif>
+                            <option value="{{ $v['id'] }}"  @if(isset($lg_id)&&$lg_id==$v['id'])  selected @endif>
                                 @if(isset($lange[$v['name_chinese']]))  {{$lange[trim($v['name_chinese'])]}} @else {{$v['name_chinese']}}   @endif
                             </option>
                         @endforeach

resources/views/sports/basket_odds.blade.php

@@ -39,7 +39,7 @@
                     <div class="layui-inline">
                         <label class="layui-form-label">{{ trans('sportssoccer.match_id') }}</label>
                         <div class="layui-input-inline">
-                            <input type="text" name="cp_id" id="cp_id" eventType="event-query"  value="{{ $match_id }}" lay-verify="required" autocomplete="off" class="layui-input" readonly="readonly">
+                            <input type="text" name="id" id="id" eventType="event-query"  value="{{ $id }}" lay-verify="required" autocomplete="off" class="layui-input" readonly="readonly">
                         </div>
                         {{--<div class="layui-input-inline checkbox">--}}
                         {{--<input type="checkbox" name="sureblur" id="sureblur" lay-skin="switch" lay-text="精确|模糊" checked>--}}
@@ -83,7 +83,7 @@
                         <a class="layui-btn layui-btn-sm lay-btn-diy"   data-type="reload" eventType="event-query-submit" style="opacity: 1; pointer-events: auto;">提交</a>
                         <a  class="layui-btn   layui-btn-sm layui-btn-normal reset" data-type="reload" style="opacity: 1; pointer-events: auto;">重置</a>
                         <a class="layui-btn layui-btn-sm layui-btn-green set" data-type="reload" style="opacity: 1; pointer-events: auto;"><i class="layui-icon">ဂ</i></a>
-                        @if(checkRriv('/admin/SportsBasket/addodds'))<a href="/admin/SportsBasket/addodds?{{ $match_id }}" class="layui-btn layui-btn-sm ">添加</a>@endif
+                        @if(checkRriv('/admin/SportsBasket/addodds'))<a href="/admin/SportsBasket/addodds?{{ $id }}" class="layui-btn layui-btn-sm ">添加</a>@endif
                         @if(checkRriv('/admin/SportsBasket/oddsdelete'))<a href="javascript:delWin('/admin/SportsBasket/oddsdelete?id=');" class="layui-btn layui-btn-sm  layui-btn-danger">删除</a>@endif
                     </div>
 

resources/views/sports/soccer_form.blade.php

@@ -2,6 +2,12 @@
 @section('content')
     <form class="layui-form" action="{{ url()->full() }}" id="submitForm" name="submitForm" method="post" eventType=eventAjaxForm>
         {!! csrf_field() !!}
+        <div class="layui-form-item" >
+            <label class="layui-form-label">赛事id</label>
+            <div class="layui-input-block">
+                <input type="text" name="id" required  lay-verify="required" placeholder="" autocomplete="off" value="{{ isset($id)?$id:'' }}" class="layui-input">
+            </div>
+        </div>
         <div class="layui-form-item">
             <label class="layui-form-label">主队名称</label>
             <div class="layui-input-block">
@@ -70,7 +76,7 @@
                     <option value></option>
                     @if(isset($parents))
                         @foreach($parents as $k=>$v)
-                            <option value="{{ $v['lg_id'] }}"  @if(isset($lg_id)&&$lg_id==$v['lg_id'])  selected @endif>
+                            <option value="{{ $v['id'] }}"  @if(isset($lg_id)&&$lg_id==$v['id'])  selected @endif>
                                 @if(isset($lange[$v['name_chinese']]))  {{$lange[trim($v['name_chinese'])]}} @else {{$v['name_chinese']}}   @endif
                             </option>
                         @endforeach

resources/views/sports/soccer_odds.blade.php

@@ -39,7 +39,7 @@
                     <div class="layui-inline">
                         <label class="layui-form-label">{{ trans('sportssoccer.match_id') }}</label>
                         <div class="layui-input-inline">
-                            <input type="text" name="cp_id" id="cp_id" eventType="event-query"  value="{{ $match_id }}" lay-verify="required" autocomplete="off" class="layui-input" readonly="readonly">
+                            <input type="text" name="id" id="id" eventType="event-query"  value="{{ $id }}" lay-verify="required" autocomplete="off" class="layui-input" readonly="readonly">
                         </div>
                         {{--<div class="layui-input-inline checkbox">--}}
                             {{--<input type="checkbox" name="sureblur" id="sureblur" lay-skin="switch" lay-text="精确|模糊" checked>--}}
@@ -83,7 +83,7 @@
                         <a class="layui-btn layui-btn-sm lay-btn-diy"   data-type="reload" eventType="event-query-submit" style="opacity: 1; pointer-events: auto;">提交</a>
                         <a  class="layui-btn   layui-btn-sm layui-btn-normal reset" data-type="reload" style="opacity: 1; pointer-events: auto;">重置</a>
                         <a class="layui-btn layui-btn-sm layui-btn-green set" data-type="reload" style="opacity: 1; pointer-events: auto;"><i class="layui-icon">ဂ</i></a>
-                        @if(checkRriv('/admin/SportsSoccer/addodds'))<a href="/admin/SportsSoccer/addodds?{{ $match_id }}" class="layui-btn layui-btn-sm ">添加</a>@endif
+                        @if(checkRriv('/admin/SportsSoccer/addodds'))<a href="/admin/SportsSoccer/addodds?{{ $id }}" class="layui-btn layui-btn-sm ">添加</a>@endif
                         @if(checkRriv('/admin/SportsSoccer/oddsdelete'))<a href="javascript:delWin('/admin/SportsSoccer/oddsdelete?id=');" class="layui-btn layui-btn-sm  layui-btn-danger">删除</a>@endif
                     </div>
 

resources/views/sports/tennis_form.blade.php

@@ -2,6 +2,12 @@
 @section('content')
     <form class="layui-form" action="{{ url()->full() }}" id="submitForm" name="submitForm" method="post" eventType=eventAjaxForm>
         {!! csrf_field() !!}
+        <div class="layui-form-item" >
+            <label class="layui-form-label">赛事id</label>
+            <div class="layui-input-block">
+                <input type="text" name="id" required  lay-verify="required" placeholder="" autocomplete="off" value="{{ isset($id)?$id:'' }}" class="layui-input">
+            </div>
+        </div>
         <div class="layui-form-item">
             <label class="layui-form-label">主队员名称</label>
             <div class="layui-input-block">
@@ -70,7 +76,7 @@
                     <option value></option>
                     @if(isset($parents))
                         @foreach($parents as $k=>$v)
-                            <option value="{{ $v['lg_id'] }}"  @if(isset($lg_id)&&$lg_id==$v['lg_id'])  selected @endif>
+                            <option value="{{ $v['id'] }}"  @if(isset($lg_id)&&$lg_id==$v['id'])  selected @endif>
                                 @if(isset($lange[$v['name_chinese']]))  {{$lange[trim($v['name_chinese'])]}} @else {{$v['name_chinese']}}   @endif
                             </option>
                         @endforeach

resources/views/sports/tennis_odds.blade.php

@@ -39,7 +39,7 @@
                     <div class="layui-inline">
                         <label class="layui-form-label">{{ trans('sportssoccer.match_id') }}</label>
                         <div class="layui-input-inline">
-                            <input type="text" name="cp_id" id="cp_id" eventType="event-query"  value="{{ $match_id }}" lay-verify="required" autocomplete="off" class="layui-input" readonly="readonly">
+                            <input type="text" name="id" id="id" eventType="event-query"  value="{{ $id }}" lay-verify="required" autocomplete="off" class="layui-input" readonly="readonly">
                         </div>
                         {{--<div class="layui-input-inline checkbox">--}}
                         {{--<input type="checkbox" name="sureblur" id="sureblur" lay-skin="switch" lay-text="精确|模糊" checked>--}}
@@ -83,7 +83,7 @@
                         <a class="layui-btn layui-btn-sm lay-btn-diy"   data-type="reload" eventType="event-query-submit" style="opacity: 1; pointer-events: auto;">提交</a>
                         <a  class="layui-btn   layui-btn-sm layui-btn-normal reset" data-type="reload" style="opacity: 1; pointer-events: auto;">重置</a>
                         <a class="layui-btn layui-btn-sm layui-btn-green set" data-type="reload" style="opacity: 1; pointer-events: auto;"><i class="layui-icon">ဂ</i></a>
-                        @if(checkRriv('/admin/SportsTennis/addodds'))<a href="/admin/SportsTennis/addodds?{{ $match_id }}" class="layui-btn layui-btn-sm ">添加</a>@endif
+                        @if(checkRriv('/admin/SportsTennis/addodds'))<a href="/admin/SportsTennis/addodds?{{ $id }}" class="layui-btn layui-btn-sm ">添加</a>@endif
                         @if(checkRriv('/admin/SportsTennis/oddsdelete'))<a href="javascript:delWin('/admin/SportsTennis/oddsdelete?id=');" class="layui-btn layui-btn-sm  layui-btn-danger">删除</a>@endif
                     </div>