异常处理

app/Http/Controllers/Admin/SportsbkController.php

@@ -20,6 +20,7 @@ class SportsbkController extends Controller {
 	public function outcome(Req $req) {
 		$request['home_team'] = isset($req->home_team) ? trim($req->home_team) : null;
 		$request['status'] = isset($req->status) ? trim($req->status) : '-1';
+		$request['if_order'] = isset($req->if_order) ? trim($req->if_order) : '1';
 		$request['sureblurs'] = isset($req->sureblurs) ? $req->sureblurs : 'on';
 		$request['star_time'] = isset($req->star_time) ? trim($req->star_time) :trans('status.default_time.seven_day') ;
         $request['end_time'] = isset($req->end_time) ? trim($req->end_time) : trans('status.default_time.etime');
@@ -334,6 +335,7 @@ class SportsbkController extends Controller {
 		$star_time = Request::get('star_time') ? Request::get('star_time').' 00:00:00' : '';
         $end_time = Request::get('end_time') ? Request::get('end_time').' 23:59:59' : '';
 		$status = Request::has('status') ? Request::get('status') : '';
+		$if_order = Request::has('if_order') ? Request::get('if_order') : '';
 		$where = array();
 		$orwhere = array();
 		if (!empty($home_team)) {
@@ -368,7 +370,7 @@ class SportsbkController extends Controller {
 		}
 		
 		$newapp = new \App\Models\Stlqresult();
-		$data = $newapp->resultbklist($list, $page, $where, $orwhere);
+		$data = $newapp->resultbklist($list, $page, $where, $orwhere,$if_order);
 		
 		for ($i=0; $i < count($data['data']); $i++) { 
 			$home_score = json_decode($data['data'][$i]['home_score'],true);

app/Http/Controllers/Admin/SportsbqController.php

@@ -18,6 +18,7 @@ class SportsbqController extends Controller {
 	function outcome(Req $req) {
 		$request=array();
 		$request['status'] = isset($req->status) ? trim($req->status) : '-1';
+		$request['if_order'] = isset($req->if_order) ? trim($req->if_order) : '1';
 		$request['sureblurs'] = isset($req->sureblurs) ? $req->sureblurs : 'on';
 		$request['home_team'] = isset($req->home_team) ? trim($req->home_team) : null;
 		$request['star_time'] = isset($req->star_time) ? trim($req->star_time) :trans('status.default_time.seven_day') ;
@@ -45,6 +46,7 @@ class SportsbqController extends Controller {
 		$home_team = Request::has('home_team') ? Request::get('home_team') : '';
 		$sureblur = Request::has('sureblurs') ? Request::get('sureblurs') : 'off';
 		$status = Request::has('status') ? Request::get('status') : '';
+		$if_order = Request::has('if_order') ? Request::get('if_order') : '';
 		$star_time = Request::get('star_time') ? Request::get('star_time').' 00:00:00' : '';
         $end_time = Request::get('end_time') ? Request::get('end_time').' 23:59:59' : '';
 
@@ -83,7 +85,7 @@ class SportsbqController extends Controller {
 
 		
 		$newapp = new \App\Models\Stbqresult();
-        $data = $newapp->getinfo($list, $page, $where,$orwhere);
+        $data = $newapp->getinfo($list, $page, $where,$orwhere,$if_order);
         
         return \App\Lib\DataTable\DataTable::init()->toJson($data['data'], $data['total']);
 	}

app/Http/Controllers/Admin/SportsfootController.php

@@ -511,6 +511,7 @@ class SportsfootController extends Controller {
 		$request=array();
 		$request['home_team'] = isset($req->home_team) ? trim($req->home_team) : null;
 		$request['status'] = isset($req->status) ? trim($req->status) : '-1';
+		$request['if_order'] = isset($req->if_order) ? trim($req->if_order) : '1';
 		$request['sureblurs'] = isset($req->sureblurs) ? $req->sureblurs : 'on';
 		$request['star_time'] = isset($req->star_time) ? trim($req->star_time) :trans('status.default_time.seven_day') ;
         $request['end_time'] = isset($req->end_time) ? trim($req->end_time) : trans('status.default_time.etime');
@@ -818,6 +819,7 @@ class SportsfootController extends Controller {
 		$home_team = Request::has('home_team') ? Request::get('home_team') : '';
 		$sureblur = Request::has('sureblurs') ? Request::get('sureblurs') : 'off';
 		$status = Request::has('status') ? Request::get('status') : '';
+		$if_order = Request::has('if_order') ? Request::get('if_order') : '';
         $star_time = Request::get('star_time') ? Request::get('star_time').' 00:00:00' : '';
         $end_time = Request::get('end_time') ? Request::get('end_time').' 23:59:59' : '';
 
@@ -855,8 +857,7 @@ class SportsfootController extends Controller {
         }
 
         $newapp = new \App\Models\Stzqresult();
-        $data = $newapp->resultlist($list, $page, $where, $orwhere);
-
+        $data = $newapp->resultlist($list, $page, $where, $orwhere,$if_order);
         
         return \App\Lib\DataTable\DataTable::init()->toJson($data['data'], $data['total']);
     }

app/Http/Controllers/Admin/SportswqController.php

@@ -21,6 +21,7 @@ class SportswqController extends Controller {
 		$request=array();
 		$request['home_team'] = isset($req->home_team) ? trim($req->home_team) : null;
 		$request['status'] = isset($req->status) ? trim($req->status) : '-1';
+		$request['if_order'] = isset($req->if_order) ? trim($req->if_order) : '1';
 		$request['sureblurs'] = isset($req->sureblurs) ? $req->sureblurs : 'on';
 		$request['name_chinese'] = isset($req->name_chinese) ? $req->name_chinese : null;
 		$request['star_time'] = isset($req->star_time) ? trim($req->star_time) :trans('status.default_time.seven_day') ;
@@ -52,6 +53,7 @@ class SportswqController extends Controller {
 		$home_team = Request::has('home_team') ? Request::get('home_team') : '';
 		$sureblur = Request::has('sureblurs') ? Request::get('sureblurs') : 'off';
 		$status = Request::has('status') ? Request::get('status') : '';
+		$if_order = Request::has('if_order') ? Request::get('if_order') : '';
         $star_time = Request::get('star_time') ? Request::get('star_time').' 00:00:00' : '';
         $end_time = Request::get('end_time') ? Request::get('end_time').' 23:59:59' : '';
         $name_chinese = Request::has('name_chinese') ? Request::get('name_chinese') : '';
@@ -94,7 +96,7 @@ class SportswqController extends Controller {
 		}
 
         $newapp = new \App\Models\Stwqresult();
-        $data = $newapp->resultlist($list, $page, $where, $orwhere);
+        $data = $newapp->resultlist($list, $page, $where, $orwhere,$if_order);
 
         return \App\Lib\DataTable\DataTable::init()->toJson($data['data'], $data['total']);
 	}

app/Models/Stbqresult.php

@@ -11,14 +11,28 @@ class Stbqresult extends BaseModel {
     protected $table = "st_bq_result";
     public $timestamps = false;
 
-    function getinfo($list = 10, $page, $where = '',$orwhere = '')
+    function getinfo($list = 10, $page, $where = '',$orwhere = '',$if_order)
     {
-    	if (is_array ($where) && count ($where) > 0) {
-            $data = $this->join('st_bq_league','st_bq_result.lg_id','=','st_bq_league.id')->join('st_bq_competition','st_bq_competition.id','=','st_bq_result.match_id')->select($this->table.'.id',$this->table.'.home_team',$this->table.'.guest_team',$this->table.'.match_id','st_bq_result.guest_team','st_bq_result.home_rate','st_bq_result.guest_rate','st_bq_result.first_score','st_bq_competition.status','st_bq_result.last_score','st_bq_result.match_score','st_bq_result.match_winer','st_bq_result.update_time','st_bq_competition.match_time','st_bq_result.match_process',$this->table.'.home_score',$this->table.'.guest_score',$this->table.'.u_guest_score',$this->table.'.u_home_score',$this->table.'.start_time','st_bq_league.name_chinese as saisname')->orderby('st_bq_result.id','desc')->where($where)->orwhere($orwhere)->paginate ($list);
-        } else { 
-        	$data = $this->join('st_bq_league','st_bq_result.lg_id','=','st_bq_league.id')->join('st_bq_competition','st_bq_competition.id','=','st_bq_result.match_id')->select($this->table.'.id',$this->table.'.home_team',$this->table.'.guest_team',$this->table.'.match_id','st_bq_result.guest_team','st_bq_result.home_rate','st_bq_result.guest_rate','st_bq_result.first_score','st_bq_competition.status','st_bq_result.last_score','st_bq_result.match_score','st_bq_result.match_winer','st_bq_result.update_time','st_bq_competition.match_time','st_bq_result.match_process',$this->table.'.home_score',$this->table.'.guest_score',$this->table.'.u_guest_score',$this->table.'.u_home_score',$this->table.'.start_time','st_bq_league.name_chinese as saisname')->orderby('st_bq_result.id','desc')->paginate ($list);
+        $match_ids = \App\Models\MoneyBuyMatch::select('match_id')->where('game_code','bq')->get()->toArray();
+        $match_ids = array_column($match_ids,'match_id');
+        //去重
+        $match_ids = array_unique($match_ids);
+
+        if($if_order == 1){
+            if (is_array ($where) && count ($where) > 0) {
+                $data = $this->join('st_bq_league','st_bq_result.lg_id','=','st_bq_league.id')->join('st_bq_competition','st_bq_competition.id','=','st_bq_result.match_id')->select($this->table.'.id',$this->table.'.home_team',$this->table.'.guest_team',$this->table.'.match_id','st_bq_result.guest_team','st_bq_result.home_rate','st_bq_result.guest_rate','st_bq_result.first_score','st_bq_competition.status','st_bq_result.last_score','st_bq_result.match_score','st_bq_result.match_winer','st_bq_result.update_time','st_bq_competition.match_time','st_bq_result.match_process',$this->table.'.home_score',$this->table.'.guest_score',$this->table.'.u_guest_score',$this->table.'.u_home_score',$this->table.'.start_time','st_bq_league.name_chinese as saisname')->orderby('st_bq_result.id','desc')->where($where)->wherein('st_bq_competition.id',$match_ids)->paginate ($list);
+            } else {
+                $data = $this->join('st_bq_league','st_bq_result.lg_id','=','st_bq_league.id')->join('st_bq_competition','st_bq_competition.id','=','st_bq_result.match_id')->select($this->table.'.id',$this->table.'.home_team',$this->table.'.guest_team',$this->table.'.match_id','st_bq_result.guest_team','st_bq_result.home_rate','st_bq_result.guest_rate','st_bq_result.first_score','st_bq_competition.status','st_bq_result.last_score','st_bq_result.match_score','st_bq_result.match_winer','st_bq_result.update_time','st_bq_competition.match_time','st_bq_result.match_process',$this->table.'.home_score',$this->table.'.guest_score',$this->table.'.u_guest_score',$this->table.'.u_home_score',$this->table.'.start_time','st_bq_league.name_chinese as saisname')->orderby('st_bq_result.id','desc')->wherein('st_bq_competition.id',$match_ids)->paginate ($list);
+            }
+        }else{
+            if (is_array ($where) && count ($where) > 0) {
+                $data = $this->join('st_bq_league','st_bq_result.lg_id','=','st_bq_league.id')->join('st_bq_competition','st_bq_competition.id','=','st_bq_result.match_id')->select($this->table.'.id',$this->table.'.home_team',$this->table.'.guest_team',$this->table.'.match_id','st_bq_result.guest_team','st_bq_result.home_rate','st_bq_result.guest_rate','st_bq_result.first_score','st_bq_competition.status','st_bq_result.last_score','st_bq_result.match_score','st_bq_result.match_winer','st_bq_result.update_time','st_bq_competition.match_time','st_bq_result.match_process',$this->table.'.home_score',$this->table.'.guest_score',$this->table.'.u_guest_score',$this->table.'.u_home_score',$this->table.'.start_time','st_bq_league.name_chinese as saisname')->orderby('st_bq_result.id','desc')->where($where)->paginate ($list);
+            } else {
+                $data = $this->join('st_bq_league','st_bq_result.lg_id','=','st_bq_league.id')->join('st_bq_competition','st_bq_competition.id','=','st_bq_result.match_id')->select($this->table.'.id',$this->table.'.home_team',$this->table.'.guest_team',$this->table.'.match_id','st_bq_result.guest_team','st_bq_result.home_rate','st_bq_result.guest_rate','st_bq_result.first_score','st_bq_competition.status','st_bq_result.last_score','st_bq_result.match_score','st_bq_result.match_winer','st_bq_result.update_time','st_bq_competition.match_time','st_bq_result.match_process',$this->table.'.home_score',$this->table.'.guest_score',$this->table.'.u_guest_score',$this->table.'.u_home_score',$this->table.'.start_time','st_bq_league.name_chinese as saisname')->orderby('st_bq_result.id','desc')->paginate ($list);
+            }
         }
 
+
         $newsim = new \App\Models\SportsNoteList();
         $simplex = $newsim->getsim('bq');
         $newstr = new \App\Models\MoneyBuyStr();

app/Models/Stlqresult.php

@@ -8,14 +8,28 @@ class Stlqresult extends BaseModel
 	public $timestamps = false;
     protected $fillable = ['lg_id','home_team','guest_team','home_rate','guest_rate','home_score','status','first_score','last_score','match_score','guest_score','match_winer','update_time','match_time','match_process','tag','u_home_score','u_guest_score','match_id','all_goal','source'];
 
-    function resultbklist($list = 10, $page, $where = '', $orwhere = '')
+    function resultbklist($list = 10, $page, $where = '', $orwhere = '',$if_order)
     {
-        if (is_array ($where) && count ($where) > 0) { 
-            $data = $this->join('st_lq_league','st_lq_result.lg_id','=','st_lq_league.id')->join('st_lq_competition','st_lq_competition.id','=','st_lq_result.match_id')->select($this->table.'.id',$this->table.'.lg_id',$this->table.'.home_team',$this->table.'.guest_team',$this->table.'.home_rate',$this->table.'.guest_rate',$this->table.'.home_score',$this->table.'.guest_score',$this->table.'.all_goal','st_lq_competition.status',$this->table.'.first_score',$this->table.'.last_score',$this->table.'.match_score',$this->table.'.match_winer',$this->table.'.update_time',$this->table.'.match_time',$this->table.'.match_process',$this->table.'.tag',$this->table.'.match_id',$this->table.'.u_home_score',$this->table.'.start_time',$this->table.'.u_guest_score','st_lq_league.name_chinese')->orderby($this->table.'.id','desc')->where($where)->orwhere($orwhere)->paginate ($list); 
-        } else {
-            $data = $this->join('st_lq_league','st_lq_result.lg_id','=','st_lq_league.id')->join('st_lq_competition','st_lq_competition.id','=','st_lq_result.match_id')->select($this->table.'.id',$this->table.'.lg_id',$this->table.'.home_team',$this->table.'.guest_team',$this->table.'.home_rate',$this->table.'.guest_rate',$this->table.'.home_score',$this->table.'.guest_score',$this->table.'.all_goal','st_lq_competition.status',$this->table.'.first_score',$this->table.'.last_score',$this->table.'.match_score',$this->table.'.match_winer',$this->table.'.update_time',$this->table.'.match_time',$this->table.'.match_process',$this->table.'.tag',$this->table.'.match_id',$this->table.'.u_home_score',$this->table.'.start_time',$this->table.'.u_guest_score','st_lq_league.name_chinese')->orderby($this->table.'.id','desc')->paginate ($list); 
+        $match_ids = \App\Models\MoneyBuyMatch::select('match_id')->where('game_code','lq')->get()->toArray();
+        $match_ids = array_column($match_ids,'match_id');
+        //去重
+        $match_ids = array_unique($match_ids);
+
+        if($if_order == 1){
+            if (is_array ($where) && count ($where) > 0) {
+                $data = $this->join('st_lq_league','st_lq_result.lg_id','=','st_lq_league.id')->join('st_lq_competition','st_lq_competition.id','=','st_lq_result.match_id')->select($this->table.'.id',$this->table.'.lg_id',$this->table.'.home_team',$this->table.'.guest_team',$this->table.'.home_rate',$this->table.'.guest_rate',$this->table.'.home_score',$this->table.'.guest_score',$this->table.'.all_goal','st_lq_competition.status',$this->table.'.first_score',$this->table.'.last_score',$this->table.'.match_score',$this->table.'.match_winer',$this->table.'.update_time',$this->table.'.match_time',$this->table.'.match_process',$this->table.'.tag',$this->table.'.match_id',$this->table.'.u_home_score',$this->table.'.start_time',$this->table.'.u_guest_score','st_lq_league.name_chinese')->orderby($this->table.'.id','desc')->where($where)->wherein('st_lq_competition.id',$match_ids)->paginate ($list);
+            } else {
+                $data = $this->join('st_lq_league','st_lq_result.lg_id','=','st_lq_league.id')->join('st_lq_competition','st_lq_competition.id','=','st_lq_result.match_id')->select($this->table.'.id',$this->table.'.lg_id',$this->table.'.home_team',$this->table.'.guest_team',$this->table.'.home_rate',$this->table.'.guest_rate',$this->table.'.home_score',$this->table.'.guest_score',$this->table.'.all_goal','st_lq_competition.status',$this->table.'.first_score',$this->table.'.last_score',$this->table.'.match_score',$this->table.'.match_winer',$this->table.'.update_time',$this->table.'.match_time',$this->table.'.match_process',$this->table.'.tag',$this->table.'.match_id',$this->table.'.u_home_score',$this->table.'.start_time',$this->table.'.u_guest_score','st_lq_league.name_chinese')->orderby($this->table.'.id','desc')->wherein('st_lq_competition.id',$match_ids)->paginate ($list);
+            }
+        }else{
+            if (is_array ($where) && count ($where) > 0) {
+                $data = $this->join('st_lq_league','st_lq_result.lg_id','=','st_lq_league.id')->join('st_lq_competition','st_lq_competition.id','=','st_lq_result.match_id')->select($this->table.'.id',$this->table.'.lg_id',$this->table.'.home_team',$this->table.'.guest_team',$this->table.'.home_rate',$this->table.'.guest_rate',$this->table.'.home_score',$this->table.'.guest_score',$this->table.'.all_goal','st_lq_competition.status',$this->table.'.first_score',$this->table.'.last_score',$this->table.'.match_score',$this->table.'.match_winer',$this->table.'.update_time',$this->table.'.match_time',$this->table.'.match_process',$this->table.'.tag',$this->table.'.match_id',$this->table.'.u_home_score',$this->table.'.start_time',$this->table.'.u_guest_score','st_lq_league.name_chinese')->orderby($this->table.'.id','desc')->where($where)->paginate ($list);
+            } else {
+                $data = $this->join('st_lq_league','st_lq_result.lg_id','=','st_lq_league.id')->join('st_lq_competition','st_lq_competition.id','=','st_lq_result.match_id')->select($this->table.'.id',$this->table.'.lg_id',$this->table.'.home_team',$this->table.'.guest_team',$this->table.'.home_rate',$this->table.'.guest_rate',$this->table.'.home_score',$this->table.'.guest_score',$this->table.'.all_goal','st_lq_competition.status',$this->table.'.first_score',$this->table.'.last_score',$this->table.'.match_score',$this->table.'.match_winer',$this->table.'.update_time',$this->table.'.match_time',$this->table.'.match_process',$this->table.'.tag',$this->table.'.match_id',$this->table.'.u_home_score',$this->table.'.start_time',$this->table.'.u_guest_score','st_lq_league.name_chinese')->orderby($this->table.'.id','desc')->paginate ($list);
+            }
         }
 
+
         $newsim = new \App\Models\SportsNoteList();
         $simplex = $newsim->getsim('lq');
         $newstr = new \App\Models\MoneyBuyStr();

app/Models/Stwqresult.php

@@ -9,14 +9,28 @@ class Stwqresult extends Model
     protected $table = 'st_wq_result';
     public $timestamps = false;
 
-    function resultlist($list = 10, $page, $where = '', $orwhere = '')
+    function resultlist($list = 10, $page, $where = '', $orwhere = '',$if_order)
     {
-        if (is_array ($where) && count ($where) > 0) {
-            $data = $this->join('st_wq_league','st_wq_result.lg_id','=','st_wq_league.id')->join('st_wq_competition','st_wq_competition.id','=','st_wq_result.match_id')->select($this->table.'.id',$this->table.'.home_player_name',$this->table.'.guest_player_name',$this->table.'.match_id','st_wq_result.first_score_player','st_wq_competition.status','st_wq_result.last_score_player','st_wq_result.match_score','st_wq_result.update_time','st_wq_competition.match_time','st_wq_result.match_process',$this->table.'.home_player_score',$this->table.'.guest_player_score',$this->table.'.start_time','st_wq_league.name_chinese as saisname')->orderby('st_wq_result.id','desc')->where($where)->orwhere($orwhere)->paginate ($list);
-        } else {   
-            $data = $this->join('st_wq_league','st_wq_result.lg_id','=','st_wq_league.id')->join('st_wq_competition','st_wq_competition.id','=','st_wq_result.match_id')->select($this->table.'.id',$this->table.'.home_player_name',$this->table.'.guest_player_name',$this->table.'.match_id','st_wq_result.first_score_player','st_wq_competition.status','st_wq_result.last_score_player','st_wq_result.match_score','st_wq_result.update_time','st_wq_competition.match_time','st_wq_result.match_process',$this->table.'.home_player_score',$this->table.'.guest_player_score',$this->table.'.start_time','st_wq_league.name_chinese as saisname')->orderby('st_wq_result.id','desc')->paginate ($list); 
+        $match_ids = \App\Models\MoneyBuyMatch::select('match_id')->where('game_code','wq')->get()->toArray();
+        $match_ids = array_column($match_ids,'match_id');
+        //去重
+        $match_ids = array_unique($match_ids);
+
+        if($if_order == 1){
+            if (is_array ($where) && count ($where) > 0) {
+                $data = $this->join('st_wq_league','st_wq_result.lg_id','=','st_wq_league.id')->join('st_wq_competition','st_wq_competition.id','=','st_wq_result.match_id')->select($this->table.'.id',$this->table.'.home_player_name',$this->table.'.guest_player_name',$this->table.'.match_id','st_wq_result.first_score_player','st_wq_competition.status','st_wq_result.last_score_player','st_wq_result.match_score','st_wq_result.update_time','st_wq_competition.match_time','st_wq_result.match_process',$this->table.'.home_player_score',$this->table.'.guest_player_score',$this->table.'.start_time','st_wq_league.name_chinese as saisname')->orderby('st_wq_result.id','desc')->where($where)->wherein('st_wq_competition.id',$match_ids)->paginate ($list);
+            } else {
+                $data = $this->join('st_wq_league','st_wq_result.lg_id','=','st_wq_league.id')->join('st_wq_competition','st_wq_competition.id','=','st_wq_result.match_id')->select($this->table.'.id',$this->table.'.home_player_name',$this->table.'.guest_player_name',$this->table.'.match_id','st_wq_result.first_score_player','st_wq_competition.status','st_wq_result.last_score_player','st_wq_result.match_score','st_wq_result.update_time','st_wq_competition.match_time','st_wq_result.match_process',$this->table.'.home_player_score',$this->table.'.guest_player_score',$this->table.'.start_time','st_wq_league.name_chinese as saisname')->orderby('st_wq_result.id','desc')->wherein('st_wq_competition.id',$match_ids)->paginate ($list);
+            }
+        }else{
+            if (is_array ($where) && count ($where) > 0) {
+                $data = $this->join('st_wq_league','st_wq_result.lg_id','=','st_wq_league.id')->join('st_wq_competition','st_wq_competition.id','=','st_wq_result.match_id')->select($this->table.'.id',$this->table.'.home_player_name',$this->table.'.guest_player_name',$this->table.'.match_id','st_wq_result.first_score_player','st_wq_competition.status','st_wq_result.last_score_player','st_wq_result.match_score','st_wq_result.update_time','st_wq_competition.match_time','st_wq_result.match_process',$this->table.'.home_player_score',$this->table.'.guest_player_score',$this->table.'.start_time','st_wq_league.name_chinese as saisname')->orderby('st_wq_result.id','desc')->where($where)->paginate ($list);
+            } else {
+                $data = $this->join('st_wq_league','st_wq_result.lg_id','=','st_wq_league.id')->join('st_wq_competition','st_wq_competition.id','=','st_wq_result.match_id')->select($this->table.'.id',$this->table.'.home_player_name',$this->table.'.guest_player_name',$this->table.'.match_id','st_wq_result.first_score_player','st_wq_competition.status','st_wq_result.last_score_player','st_wq_result.match_score','st_wq_result.update_time','st_wq_competition.match_time','st_wq_result.match_process',$this->table.'.home_player_score',$this->table.'.guest_player_score',$this->table.'.start_time','st_wq_league.name_chinese as saisname')->orderby('st_wq_result.id','desc')->paginate ($list);
+            }
         }
 
+
         $newsim = new \App\Models\SportsNoteList();
         $simplex = $newsim->getsim('wq');
         $newstr = new \App\Models\MoneyBuyStr();

app/Models/Stzqresult.php

@@ -8,14 +8,28 @@ class Stzqresult extends BaseModel
 	public $timestamps = false;
     protected $fillable = ['id','lg_id','home_team','guest_team','home_rate','guest_rate','home_score','status','first_score','last_score','match_score','guest_score','match_winer','update_time','match_time','match_process','tag','u_home_score','u_guest_score','match_id','all_goal','penalty_card','corner_ball','source','p_code'];
 
-    function resultlist($list = 10, $page, $where = '',$orwhere = '')
+    function resultlist($list = 10, $page, $where = '',$orwhere = '',$if_order)
     {
-        if (is_array ($where) && count ($where) > 0) {
-            $data = $this->join('st_zq_league','st_zq_result.lg_id','=','st_zq_league.id')->join('st_zq_competition','st_zq_competition.id','=','st_zq_result.match_id')->select($this->table.'.id',$this->table.'.home_team',$this->table.'.guest_team',$this->table.'.match_id','st_zq_result.guest_team','st_zq_result.home_rate','st_zq_result.guest_rate','st_zq_result.first_score','st_zq_competition.status','st_zq_result.last_score','st_zq_result.match_score','st_zq_result.match_winer','st_zq_result.update_time','st_zq_competition.match_time','st_zq_result.match_process',$this->table.'.home_score',$this->table.'.guest_score',$this->table.'.u_guest_score',$this->table.'.u_home_score',$this->table.'.start_time','st_zq_league.name_chinese as saisname')->orderby('st_zq_result.match_id','desc')->where($where)->orwhere($orwhere)->paginate ($list);
-        } else { 
-            $data = $this->join('st_zq_league','st_zq_result.lg_id','=','st_zq_league.id')->join('st_zq_competition','st_zq_competition.id','=','st_zq_result.match_id')->select($this->table.'.id',$this->table.'.home_team',$this->table.'.guest_team',$this->table.'.match_id','st_zq_result.guest_team','st_zq_result.home_rate','st_zq_result.guest_rate','st_zq_result.first_score','st_zq_competition.status','st_zq_result.last_score','st_zq_result.match_score','st_zq_result.match_winer','st_zq_result.update_time','st_zq_competition.match_time','st_zq_result.match_process',$this->table.'.home_score',$this->table.'.guest_score',$this->table.'.u_guest_score',$this->table.'.u_home_score',$this->table.'.start_time','st_zq_league.name_chinese as saisname')->orderby('st_zq_result.match_id','desc')->paginate ($list);
+        $match_ids = \App\Models\MoneyBuyMatch::select('match_id')->where('game_code','zq')->get()->toArray();
+        $match_ids = array_column($match_ids,'match_id');
+        //去重
+        $match_ids = array_unique($match_ids);
+        //print_r($match_ids);exit;
+        if($if_order == 1){
+            if (is_array ($where) && count ($where) > 0) {
+                $data = $this->join('st_zq_league','st_zq_result.lg_id','=','st_zq_league.id')->join('st_zq_competition','st_zq_competition.id','=','st_zq_result.match_id')->select($this->table.'.id',$this->table.'.home_team',$this->table.'.guest_team',$this->table.'.match_id','st_zq_result.guest_team','st_zq_result.home_rate','st_zq_result.guest_rate','st_zq_result.first_score','st_zq_competition.status','st_zq_result.last_score','st_zq_result.match_score','st_zq_result.match_winer','st_zq_result.update_time','st_zq_competition.match_time','st_zq_result.match_process',$this->table.'.home_score',$this->table.'.guest_score',$this->table.'.u_guest_score',$this->table.'.u_home_score',$this->table.'.start_time','st_zq_league.name_chinese as saisname')->orderby('st_zq_result.match_id','desc')->where($where)->wherein('st_zq_competition.id',$match_ids)->paginate ($list);
+            } else {
+                $data = $this->join('st_zq_league','st_zq_result.lg_id','=','st_zq_league.id')->join('st_zq_competition','st_zq_competition.id','=','st_zq_result.match_id')->select($this->table.'.id',$this->table.'.home_team',$this->table.'.guest_team',$this->table.'.match_id','st_zq_result.guest_team','st_zq_result.home_rate','st_zq_result.guest_rate','st_zq_result.first_score','st_zq_competition.status','st_zq_result.last_score','st_zq_result.match_score','st_zq_result.match_winer','st_zq_result.update_time','st_zq_competition.match_time','st_zq_result.match_process',$this->table.'.home_score',$this->table.'.guest_score',$this->table.'.u_guest_score',$this->table.'.u_home_score',$this->table.'.start_time','st_zq_league.name_chinese as saisname')->orderby('st_zq_result.match_id','desc')->whereIn('st_zq_competition.id',$match_ids)->paginate ($list);
+            }
+        }else{
+            if (is_array ($where) && count ($where) > 0) {
+                $data = $this->join('st_zq_league','st_zq_result.lg_id','=','st_zq_league.id')->join('st_zq_competition','st_zq_competition.id','=','st_zq_result.match_id')->select($this->table.'.id',$this->table.'.home_team',$this->table.'.guest_team',$this->table.'.match_id','st_zq_result.guest_team','st_zq_result.home_rate','st_zq_result.guest_rate','st_zq_result.first_score','st_zq_competition.status','st_zq_result.last_score','st_zq_result.match_score','st_zq_result.match_winer','st_zq_result.update_time','st_zq_competition.match_time','st_zq_result.match_process',$this->table.'.home_score',$this->table.'.guest_score',$this->table.'.u_guest_score',$this->table.'.u_home_score',$this->table.'.start_time','st_zq_league.name_chinese as saisname')->orderby('st_zq_result.match_id','desc')->where($where)->paginate ($list);
+            } else {
+                $data = $this->join('st_zq_league','st_zq_result.lg_id','=','st_zq_league.id')->join('st_zq_competition','st_zq_competition.id','=','st_zq_result.match_id')->select($this->table.'.id',$this->table.'.home_team',$this->table.'.guest_team',$this->table.'.match_id','st_zq_result.guest_team','st_zq_result.home_rate','st_zq_result.guest_rate','st_zq_result.first_score','st_zq_competition.status','st_zq_result.last_score','st_zq_result.match_score','st_zq_result.match_winer','st_zq_result.update_time','st_zq_competition.match_time','st_zq_result.match_process',$this->table.'.home_score',$this->table.'.guest_score',$this->table.'.u_guest_score',$this->table.'.u_home_score',$this->table.'.start_time','st_zq_league.name_chinese as saisname')->orderby('st_zq_result.match_id','desc')->paginate ($list);
+            }
         }
 
+
         $newsim = new \App\Models\SportsNoteList();
         $simplex = $newsim->getsim('zq');
         $newstr = new \App\Models\MoneyBuyStr();

resources/lang/zh-cn/Sportsbq.php

@@ -30,5 +30,6 @@ return array(
     'statusmatch' => '比赛状态',
     'operation' => '操作',
     'totime' => '时间',
+    'if_order' => '是否有注单',
 
 );

resources/lang/zh-cn/sportsbk.php

@@ -47,5 +47,6 @@ return array(
 	'fullcourt' => '全场', 
 	'operation' => '操作',
 	'start_time' => '时间',
+	'if_order' => '是否有注单',
 	
 );

resources/lang/zh-cn/sportsfoot.php

@@ -82,4 +82,5 @@ return array(
 	'is_m' => '是否早盘',
 	'is_s' => '是否串场',
 	'ptime' => '赛事进行时间',
+	'if_order' => '是否有注单',
 );

resources/lang/zh-cn/sportswq.php

@@ -30,6 +30,6 @@ return array(
     'statusmatch' => '比赛状态',
     'operation' => '操作',
     'start_time' => '时间',
-
+    'if_order' => '是否有注单',
 
 );

resources/lang/zh-cn/status.php

@@ -365,6 +365,12 @@ return array(
 			'6' => '已取消',
 		),
 	),
+	'if_order' => array(
+		'status' => array(
+			'1' => '有注单赛事',
+			'2' => '全部赛事',
+		),
+	),
 	'league_status' => array(
 		'status' => array(
 			'-1' => '未启用',

resources/views/admin/Sportsbq/outcome.blade.php

@@ -93,7 +93,7 @@
                     <div class="layui-inline">
                         <label class="layui-form-label">{{ trans('sportsbk.sousuo') }}</label>
                         <div class="layui-input-inline">
-                            <input type="text" name="home_team" id="home_team" eventType="event-query"  value="{{ $home_team }}" lay-verify="required" autocomplete="off" class="layui-input" placeholder="输入赛事id,主队,客队名">
+                            <input type="text" name="home_team" id="home_team" eventType="event-query"  value="{{ $home_team }}" lay-verify="required" autocomplete="off" class="layui-input" placeholder="赛事id/主队名">
                         </div>
                         <div class="layui-input-inline checkbox">
                             <input type="checkbox" name="sureblur" id="form_sureblur" lay-skin="switch" lay-text="精确|模糊" @if(!isset($sureblurs) || $sureblurs=='on') checked @endif  class="layui-input" eventType=event-query>
@@ -115,6 +115,22 @@
                             </select>
                         </div>
                    </div>
+
+                    <div class="layui-inline">
+                        <label class="layui-form-label">{{ trans('sportsbq.if_order') }}</label>
+                        <div class="layui-input-inline" style="width: 200px">
+                            <select name="if_order"  id="if_order"  lay-verify="" autocomplete="off" class="layui-input"  eventType=event-query>
+                                @foreach(trans('status.if_order.status') as $k=>$v):
+                                @if($if_order==$k))
+                                <option value="{{$k}}" selected="selected">{{$v}}</option>
+                                @else
+                                    <option value="{{$k}}">{{$v}}</option>
+                                @endif
+                                @endforeach
+                            </select>
+                        </div>
+                    </div>
+
                     <div class="layui-inline">
                         <label class="layui-form-label">{{ trans('sportsfoot.star_time') }}</label>
                         <div class="layui-input-inline">

resources/views/admin/Sportswq/outcome.blade.php

@@ -85,7 +85,7 @@
                     <div class="layui-inline">
                         <label class="layui-form-label">{{ trans('sportsbk.sousuo') }}</label>
                         <div class="layui-input-inline">
-                            <input type="text" name="home_team" id="home_team" eventType="event-query"  value="{{ $home_team }}" lay-verify="required" autocomplete="off" class="layui-input" placeholder="输入赛事id,主队员,客队员">
+                            <input type="text" name="home_team" id="home_team" eventType="event-query"  value="{{ $home_team }}" lay-verify="required" autocomplete="off" class="layui-input" placeholder="赛事id/主队员">
                         </div>
                         <div class="layui-input-inline checkbox">
                             <input type="checkbox" name="sureblur" id="form_sureblur" lay-skin="switch" lay-text="精确|模糊" @if(!isset($sureblurs) || $sureblurs=='on') checked @endif  class="layui-input" eventType=event-query>
@@ -107,6 +107,22 @@
                             </select>
                         </div>
                    </div>
+
+                    <div class="layui-inline">
+                        <label class="layui-form-label">{{ trans('sportswq.if_order') }}</label>
+                        <div class="layui-input-inline" style="width: 200px">
+                            <select name="if_order"  id="if_order"  lay-verify="" autocomplete="off" class="layui-input"  eventType=event-query>
+                                @foreach(trans('status.if_order.status') as $k=>$v):
+                                @if($if_order==$k))
+                                <option value="{{$k}}" selected="selected">{{$v}}</option>
+                                @else
+                                    <option value="{{$k}}">{{$v}}</option>
+                                @endif
+                                @endforeach
+                            </select>
+                        </div>
+                    </div>
+
                     <div class="layui-inline">
                         <label class="layui-form-label">{{ trans('sportsfoot.star_time') }}</label>
                         <div class="layui-input-inline">

resources/views/admin/sportsbk/outcome.blade.php

@@ -216,7 +216,7 @@
                     <div class="layui-inline">
                         <label class="layui-form-label">{{ trans('sportsbk.sousuo') }}</label>
                         <div class="layui-input-inline">
-                            <input type="text" name="home_team" id="home_team" eventType="event-query"  value="{{ $home_team }}" lay-verify="required" autocomplete="off" class="layui-input" placeholder="输入赛事id,主队,客队名">
+                            <input type="text" name="home_team" id="home_team" eventType="event-query"  value="{{ $home_team }}" lay-verify="required" autocomplete="off" class="layui-input" placeholder="赛事id/主队名">
                         </div>
                         <div class="layui-input-inline checkbox">
                             <input type="checkbox" name="sureblur" id="form_sureblur" lay-skin="switch" lay-text="精确|模糊" @if(!isset($sureblurs) || $sureblurs=='on') checked @endif  class="layui-input" eventType=event-query>
@@ -238,6 +238,22 @@
                             </select>
                         </div>
                    </div>
+
+                    <div class="layui-inline">
+                        <label class="layui-form-label">{{ trans('sportsbk.if_order') }}</label>
+                        <div class="layui-input-inline" style="width: 200px">
+                            <select name="if_order"  id="if_order"  lay-verify="" autocomplete="off" class="layui-input"  eventType=event-query>
+                                @foreach(trans('status.if_order.status') as $k=>$v):
+                                @if($if_order==$k))
+                                <option value="{{$k}}" selected="selected">{{$v}}</option>
+                                @else
+                                    <option value="{{$k}}">{{$v}}</option>
+                                @endif
+                                @endforeach
+                            </select>
+                        </div>
+                    </div>
+
                     <div class="layui-inline">
                         <label class="layui-form-label">{{ trans('sportsfoot.star_time') }}</label>
                         <div class="layui-input-inline">

resources/views/admin/sportsfoot/outcome.blade.php

@@ -104,7 +104,7 @@
                     <div class="layui-inline">
                         <label class="layui-form-label">{{ trans('sportsfoot.sousuo') }}</label>
                         <div class="layui-input-inline">
-                            <input type="text" name="home_team" id="home_team" eventType="event-query"  value="{{ $home_team }}" lay-verify="required" autocomplete="off" placeholder="赛事id,主队,客队" class="layui-input">
+                            <input type="text" name="home_team" id="home_team" eventType="event-query"  value="{{ $home_team }}" lay-verify="required" autocomplete="off" placeholder="赛事id/主队名" class="layui-input">
                         </div>
                         <div class="layui-input-inline checkbox">
                             <input type="checkbox" name="sureblur" id="form_sureblur" lay-skin="switch" lay-text="精确|模糊" @if(!isset($sureblurs) || $sureblurs=='on') checked @endif  class="layui-input" eventType=event-query>
@@ -127,6 +127,21 @@
                         </div>
                    </div>
 
+                    <div class="layui-inline">
+                        <label class="layui-form-label">{{ trans('sportsfoot.if_order') }}</label>
+                        <div class="layui-input-inline" style="width: 200px">
+                            <select name="if_order"  id="if_order"  lay-verify="" autocomplete="off" class="layui-input"  eventType=event-query>
+                                @foreach(trans('status.if_order.status') as $k=>$v):
+                                @if($if_order==$k))
+                                <option value="{{$k}}" selected="selected">{{$v}}</option>
+                                @else
+                                    <option value="{{$k}}">{{$v}}</option>
+                                @endif
+                                @endforeach
+                            </select>
+                        </div>
+                    </div>
+
                     <div class="layui-inline">
                         <label class="layui-form-label">{{ trans('sportsfoot.star_time') }}</label>
                         <div class="layui-input-inline">