追加推送 6/5

.gitignore

@@ -1,7 +1,7 @@
 /node_modules
 /public/hot
 /public/storage
-/storage/*.key
+/storage/*
 /.idea
 /.vagrant
 Homestead.json

app/Http/Controllers/Admin/BaseLeagueController.php

@@ -15,12 +15,19 @@ use Request;
 class BaseLeagueController extends Controller {
 
     public function index(Req $req) {
-        $request['name_chinese'] = isset($req->name_chinese) ? trim($req->name_chinese) : '-1';
+        //$request['name_chinese'] = isset($req->name_chinese) ? trim($req->name_chinese) : '-1';
+        $request['name_chinese'] = isset($req->name_chinese) ? trim($req->name_chinese) : '';
+        $request['area_id'] = isset($req->area_id) ? trim($req->area_id) : '';
+        $request['country_id'] = isset($req->country_id) ? trim($req->country_id) : '';
         $request['lg_id'] = isset($req->lg_id) ? trim($req->lg_id) : '';
         $request['status'] = isset($req->status) ? trim($req->status) : '0';
         $request['sureblurs'] = isset($req->sureblurs) ? $req->sureblurs : 'on';
         $data = \App\Models\BaseLeague::select('id','lg_id','name_chinese')->get();
+        $area = \App\Models\StAreaCountry::where('pid',0)->get();
+        $country = \App\Models\StAreaCountry::where('pid','!=',0)->get();
         $request['league'] = $data;
+        $request['area'] = $area;
+        $request['country'] = $country;
         $dt = \App\Lib\DataTable\DataTable::init();
         $dt->setDataSource('/admin/BaseLeague/info');
         $dt->setLang('sportsbase');
@@ -43,19 +50,26 @@ class BaseLeagueController extends Controller {
         $list = Request::has('limit') ? Request::get('limit') : 10;
         $lg_id = Request::has('lg_id') ? Request::get('lg_id') : '';
         $name_chinese = Request::has('name_chinese') ? Request::get('name_chinese') : '';
+        $area_id = Request::has('area_id') ? Request::get('area_id') : '';
+        $country_id = Request::has('country_id') ? Request::get('country_id') : '';
         $status = Request::has('status') ? Request::get('status') : '';
         $sureblur = Request::has('sureblurs') ? Request::get('sureblurs') : 'off';
         $where = array();
-        if (!empty($lg_id)) {
-//            if (empty($sureblur) || $sureblur == 'off') {
-//                $where[] = array('st_bq_league.lg_id', 'like', '%' . $lg_id . '%');
-//            }else{
-//                $where[] = array('st_bq_league.lg_id', '=', $lg_id);
-//            }
-            $where[] = array('st_bq_league.lg_id', '=', $lg_id);
+        if (!empty($name_chinese)) {
+            if (empty($sureblur) || $sureblur == 'off') {
+                $where[] = array('st_bq_league.name_chinese', 'like', '%' . $name_chinese . '%');
+            }else{
+                $where[] = array('st_bq_league.name_chinese', '=', $name_chinese);
+            }
+        }
+//        if ($name_chinese != -1) {
+//            $where[] = array('st_bq_league.name_chinese', '=', $name_chinese);
+//        }
+        if(!empty($area_id)){
+            $where[] = array('st_bq_league.area_id', '=', $area_id);
         }
-        if ($name_chinese != -1) {
-            $where[] = array('st_bq_league.name_chinese', '=', $name_chinese);
+        if(!empty($country_id)){
+            $where[] = array('st_bq_league.country_id', '=', $country_id);
         }
         if($status != 0){
             $where[] = array('st_bq_league.status', '=', $status);
@@ -175,9 +189,7 @@ class BaseLeagueController extends Controller {
             return responseToJson(-2002); //id????
         }
         $id = array();
-        //$match_id = array();
         $localleague = \App\Models\Stbqlocalleague::get();
-        //$match= \App\Models\SportsBase::get();
         if (is_array($ids) && count($ids) > 0) {
             foreach ($ids as $k => $v) {
                 if (intval($v) < 1) {
@@ -189,11 +201,6 @@ class BaseLeagueController extends Controller {
                         $id[] = $localleague[$i]->id;
                     }
                 }
-//                for($j=0;$j<count($match);$j++){
-//                    if($match[$i]->lg_id == $league->lg_id){
-//                        $match_id[] = $match[$i]->match_id;
-//                    }
-//                }
             }
         }
 
@@ -202,18 +209,12 @@ class BaseLeagueController extends Controller {
         if (!$rows) {
             return responseToJson(-2003); //id????
         }
-        $row = \App\Models\Stbqlocalleague::whereIn('id', $id)->delete();
-        if (!$row) {
-            return responseToJson(-2003); //id????
+        if(count($id)>0) {
+            $row = \App\Models\Stbqlocalleague::whereIn('id', $id)->delete();
+            if (!$row) {
+                return responseToJson(-2003); //id????
+            }
         }
-//        $row1 = \App\Models\SportsBase::whereIn('match_id', $match_id)->delete();
-//        if (!$row1) {
-//            return responseToJson(-2003); //id????
-//        }
-//        $row2 = \App\Models\Stbqlocalmatch::whereIn('match_id', $match_id)->delete();
-//        if (!$row2) {
-//            return responseToJson(-2003); //id????
-//        }
         return responseToJson(1, trans('menu.delete_success')); //id????
 
     }

app/Http/Controllers/Admin/BasketLeagueController.php

@@ -15,14 +15,19 @@ use Request;
 class BasketLeagueController extends Controller {
 
     public function index(Req $req) {
-        $request['name_chinese'] = isset($req->name_chinese) ? trim($req->name_chinese) : '-1';
-        $request['home_team'] = isset($req->home_team) ? trim($req->home_team) : null;
-        $request['match_date'] = isset($req->match_date) ? trim($req->match_date) : null;
+        //$request['name_chinese'] = isset($req->name_chinese) ? trim($req->name_chinese) : '-1';
+        $request['name_chinese'] = isset($req->name_chinese) ? trim($req->name_chinese) : '';
+        $request['area_id'] = isset($req->area_id) ? trim($req->area_id) : '';
+        $request['country_id'] = isset($req->country_id) ? trim($req->country_id) : '';
         $request['lg_id'] = isset($req->lg_id) ? trim($req->lg_id) : '';
         $request['status'] = isset($req->status) ? trim($req->status) : '0';
         $request['sureblurs'] = isset($req->sureblurs) ? $req->sureblurs : 'on';
         $data = \App\Models\BasketLeague::select('id','lg_id','name_chinese')->get();
+        $area = \App\Models\StAreaCountry::where('pid',0)->get();
+        $country = \App\Models\StAreaCountry::where('pid','!=',0)->get();
         $request['league'] = $data;
+        $request['area'] = $area;
+        $request['country'] = $country;
         $dt = \App\Lib\DataTable\DataTable::init();
         $dt->setDataSource('/admin/BasketLeague/info');
         $dt->setLang('sportsbase');
@@ -43,21 +48,27 @@ class BasketLeagueController extends Controller {
     function info(Req $req) {
         $page = Request::has('page') ? Request::get('page') : '';
         $list = Request::has('limit') ? Request::get('limit') : 10;
-        $lg_id = Request::has('lg_id') ? Request::get('lg_id') : '';
         $name_chinese = Request::has('name_chinese') ? Request::get('name_chinese') : '';
+        $area_id = Request::has('area_id') ? Request::get('area_id') : '';
+        $country_id = Request::has('country_id') ? Request::get('country_id') : '';
         $status = Request::has('status') ? Request::get('status') : '';
         $sureblur = Request::has('sureblurs') ? Request::get('sureblurs') : 'off';
         $where = array();
-        if (!empty($lg_id)) {
-//            if (empty($sureblur) || $sureblur == 'off') {
-//                $where[] = array('st_lq_league.lg_id', 'like', '%' . $lg_id . '%');
-//            }else{
-//                $where[] = array('st_lq_league.lg_id', '=', $lg_id);
-//            }
-            $where[] = array('st_lq_league.lg_id', '=', $lg_id);
+        if (!empty($name_chinese)) {
+            if (empty($sureblur) || $sureblur == 'off') {
+                $where[] = array('st_lq_league.name_chinese', 'like', '%' . $name_chinese . '%');
+            }else{
+                $where[] = array('st_lq_league.name_chinese', '=', $name_chinese);
+            }
+        }
+//        if ($name_chinese != -1) {
+//            $where[] = array('st_zq_league.name_chinese', '=', $name_chinese);
+//        }
+        if(!empty($area_id)){
+            $where[] = array('st_lq_league.area_id', '=', $area_id);
         }
-        if ($name_chinese != -1) {
-            $where[] = array('st_lq_league.name_chinese', '=', $name_chinese);
+        if(!empty($country_id)){
+            $where[] = array('st_lq_league.country_id', '=', $country_id);
         }
         if($status != 0){
             $where[] = array('st_lq_league.status', '=', $status);
@@ -122,7 +133,7 @@ class BasketLeagueController extends Controller {
     }
 
     /**
-     *修改联赛
+     *修改联赛地区，国家，联赛状态
      */
     function edit(Req $req) {
         $id = $req->id;
@@ -197,9 +208,11 @@ class BasketLeagueController extends Controller {
         if (!$rows) {
             return responseToJson(-2003); //id????
         }
-        $row = \App\Models\Stlqlocalleague::whereIn('id', $id)->delete();
-        if (!$row) {
-            return responseToJson(-2003); //id????
+        if(count($id)>0) {
+            $row = \App\Models\Stlqlocalleague::whereIn('id', $id)->delete();
+            if (!$row) {
+                return responseToJson(-2003); //id????
+            }
         }
         return responseToJson(1, trans('menu.delete_success')); //id????
 

app/Http/Controllers/Admin/SoccerLeagueController.php

@@ -15,12 +15,19 @@ use Request;
 class SoccerLeagueController extends Controller {
 
     public function index(Req $req) {
-        $request['name_chinese'] = isset($req->name_chinese) ? trim($req->name_chinese) : '-1';
+        //$request['name_chinese'] = isset($req->name_chinese) ? trim($req->name_chinese) : '-1';
+        $request['name_chinese'] = isset($req->name_chinese) ? trim($req->name_chinese) : '';
+        $request['area_id'] = isset($req->area_id) ? trim($req->area_id) : '';
+        $request['country_id'] = isset($req->country_id) ? trim($req->country_id) : '';
         $request['lg_id'] = isset($req->lg_id) ? trim($req->lg_id) : '';
         $request['status'] = isset($req->status) ? trim($req->status) : '0';
         $request['sureblurs'] = isset($req->sureblurs) ? $req->sureblurs : 'on';
         $data = \App\Models\SoccerLeague::select('id','lg_id','name_chinese')->get();
+        $area = \App\Models\StAreaCountry::where('pid',0)->get();
+        $country = \App\Models\StAreaCountry::where('pid','!=',0)->get();
         $request['league'] = $data;
+        $request['area'] = $area;
+        $request['country'] = $country;
         $dt = \App\Lib\DataTable\DataTable::init();
         $dt->setDataSource('/admin/SoccerLeague/info');
         $dt->setLang('sportsbase');
@@ -41,21 +48,27 @@ class SoccerLeagueController extends Controller {
     function info(Req $req) {
         $page = Request::has('page') ? Request::get('page') : '';
         $list = Request::has('limit') ? Request::get('limit') : 10;
-        $lg_id = Request::has('lg_id') ? Request::get('lg_id') : '';
         $name_chinese = Request::has('name_chinese') ? Request::get('name_chinese') : '';
+        $area_id = Request::has('area_id') ? Request::get('area_id') : '';
+        $country_id = Request::has('country_id') ? Request::get('country_id') : '';
         $status = Request::has('status') ? Request::get('status') : '';
         $sureblur = Request::has('sureblurs') ? Request::get('sureblurs') : 'off';
         $where = array();
-        if (!empty($lg_id)) {
-//            if (empty($sureblur) || $sureblur == 'off') {
-//                $where[] = array('st_zq_league.lg_id', 'like', '%' . $lg_id . '%');
-//            }else{
-//                $where[] = array('st_zq_league.lg_id', '=', $lg_id);
-//            }
-            $where[] = array('st_zq_league.lg_id', '=', $lg_id);
+        if (!empty($name_chinese)) {
+            if (empty($sureblur) || $sureblur == 'off') {
+                $where[] = array('st_zq_league.name_chinese', 'like', '%' . $name_chinese . '%');
+            }else{
+                $where[] = array('st_zq_league.name_chinese', '=', $name_chinese);
+            }
+        }
+//        if ($name_chinese != -1) {
+//            $where[] = array('st_zq_league.name_chinese', '=', $name_chinese);
+//        }
+        if(!empty($area_id)){
+            $where[] = array('st_zq_league.area_id', '=', $area_id);
         }
-        if ($name_chinese != -1) {
-            $where[] = array('st_zq_league.name_chinese', '=', $name_chinese);
+        if(!empty($country_id)){
+            $where[] = array('st_zq_league.country_id', '=', $country_id);
         }
         if($status != 0){
             $where[] = array('st_zq_league.status', '=', $status);
@@ -193,9 +206,11 @@ class SoccerLeagueController extends Controller {
         if (!$rows) {
             return responseToJson(-2003); //id????
         }
-        $row = \App\Models\Stzqlocalleague::whereIn('id', $id)->delete();
-        if (!$row) {
-            return responseToJson(-2003); //id????
+        if(count($id)>0) {
+            $row = \App\Models\Stzqlocalleague::whereIn('id', $id)->delete();
+            if (!$row) {
+                return responseToJson(-2003); //id????
+            }
         }
         return responseToJson(1, trans('menu.delete_success')); //id????
 

app/Http/Controllers/Admin/SportsfootController.php

@@ -193,51 +193,12 @@ class SportsfootController extends Controller {
         } else {
         	$match_id = trim($req->input('match_id'));//赛事id
         	$data = \App\Models\Stzqresult::where(['match_id'=>$match_id])->first();
-
-        	if(count($data) <= 0 ){
-        		$model = new \App\Models\Stzqresult();
-				$model->lg_id = trim($req->input('lg_id'));//联赛id
-				$model->home_team = trim($req->input('home_team'));
-				$model->guest_team = trim($req->input('guest_team'));
-				$model->home_rate = trim($req->input('home_rate'));
-				$model->guest_rate = trim($req->input('guest_rate'));
-				$model->home_score = trim($req->input('home_score'));
-				$model->status = trim($req->input('status'));
-				$model->first_score = trim($req->input('first_score'));
-				$model->last_score = trim($req->input('last_score'));
-				$model->match_score = trim($req->input('match_score'));
-				$model->match_winer = trim($req->input('match_winer'));
-				$model->update_time = date('Y-m-d H:i:s');//比赛更新时间
-				$model->match_time = '00:01';// trim($req->input('match_time'));
-				$model->match_process = trim($req->input('match_process'));
-				$model->tag = trim($req->input('tag'));
-				$model->match_id = $match_id;//赛事id
-				$model->u_home_score = trim($req->input('u_home_score'));
-				$model->u_guest_score = trim($req->input('u_guest_score'));
-				$model->save();
-				return responseToJson(1);
-			}else{
-				$data->lg_id = trim($req->input('lg_id'));//联赛id
-				$data->home_team = trim($req->input('home_team'));
-				$data->guest_team = trim($req->input('guest_team'));
-				$data->home_rate = trim($req->input('home_rate'));
-				$data->guest_rate = trim($req->input('guest_rate'));
-				$data->home_score = trim($req->input('home_score'));
-				$data->status = trim($req->input('status'));
-				$data->first_score = trim($req->input('first_score'));
-				$data->last_score = trim($req->input('last_score'));
-				$data->match_score = trim($req->input('match_score'));
-				$data->match_winer = trim($req->input('match_winer'));
-				$data->update_time = date('Y-m-d H:i:s');//比赛更新时间
-				$data->match_time = '00:01';// trim($req->input('match_time'));
-				$data->match_process = trim($req->input('match_process'));
-				$data->tag = trim($req->input('tag'));
-				$data->u_home_score = trim($req->input('u_home_score'));
-				$data->u_guest_score = trim($req->input('u_guest_score'));
-				$data->save();
-				return responseToJson(1);
-			}	
-
+        	//添加足球比赛结果表
+        	$alldata = $req->input();
+        	unset($alldata['_token']);
+        	$ret = \App\Models\Stzqresult::updateOrCreate(['match_id'=>$match_id],array_merge($alldata,['match_time'=>'00:01','update_time'=>date('Y-m-d H:i:s')]));
+        	//添加足球比赛结果记录表
+        	$ret = \App\Models\Stzqresultrecord::updateOrCreate(['match_id'=>$match_id,'update_time'=>date('Y-m-d H:i:s')],array_merge($alldata,['match_time'=>'00:01','update_time'=>date('Y-m-d H:i:s')]));
         }
     }
 

app/Http/Controllers/Admin/TennisLeagueController.php

@@ -15,12 +15,19 @@ use Request;
 class TennisLeagueController extends Controller {
 
     public function index(Req $req) {
-        $request['name_chinese'] = isset($req->name_chinese) ? trim($req->name_chinese) : '-1';
+        //$request['name_chinese'] = isset($req->name_chinese) ? trim($req->name_chinese) : '-1';
+        $request['name_chinese'] = isset($req->name_chinese) ? trim($req->name_chinese) : '';
+        $request['area_id'] = isset($req->area_id) ? trim($req->area_id) : '';
+        $request['country_id'] = isset($req->country_id) ? trim($req->country_id) : '';
         $request['lg_id'] = isset($req->lg_id) ? trim($req->lg_id) : '';
         $request['status'] = isset($req->status) ? trim($req->status) : '0';
         $request['sureblurs'] = isset($req->sureblurs) ? $req->sureblurs : 'on';
         $data = \App\Models\SoccerLeague::select('id','lg_id','name_chinese')->get();
+        $area = \App\Models\StAreaCountry::where('pid',0)->get();
+        $country = \App\Models\StAreaCountry::where('pid','!=',0)->get();
         $request['league'] = $data;
+        $request['area'] = $area;
+        $request['country'] = $country;
         $dt = \App\Lib\DataTable\DataTable::init();
         $dt->setDataSource('/admin/TennisLeague/info');
         $dt->setLang('sportsbase');
@@ -43,19 +50,26 @@ class TennisLeagueController extends Controller {
         $list = Request::has('limit') ? Request::get('limit') : 10;
         $lg_id = Request::has('lg_id') ? Request::get('lg_id') : '';
         $name_chinese = Request::has('name_chinese') ? Request::get('name_chinese') : '';
+        $area_id = Request::has('area_id') ? Request::get('area_id') : '';
+        $country_id = Request::has('country_id') ? Request::get('country_id') : '';
         $status = Request::has('status') ? Request::get('status') : '';
         $sureblur = Request::has('sureblurs') ? Request::get('sureblurs') : 'off';
         $where = array();
-        if (!empty($lg_id)) {
-//            if (empty($sureblur) || $sureblur == 'off') {
-//                $where[] = array('st_wq_league.lg_id', 'like', '%' . $lg_id . '%');
-//            }else{
-//                $where[] = array('st_wq_league.lg_id', '=', $lg_id);
-//            }
-            $where[] = array('st_wq_league.lg_id', '=', $lg_id);
+        if (!empty($name_chinese)) {
+            if (empty($sureblur) || $sureblur == 'off') {
+                $where[] = array('st_wq_league.name_chinese', 'like', '%' . $name_chinese . '%');
+            }else{
+                $where[] = array('st_wq_league.name_chinese', '=', $name_chinese);
+            }
+        }
+//        if ($name_chinese != -1) {
+//            $where[] = array('st_wq_league.name_chinese', '=', $name_chinese);
+//        }
+        if(!empty($area_id)){
+            $where[] = array('st_wq_league.area_id', '=', $area_id);
         }
-        if ($name_chinese != -1) {
-            $where[] = array('st_wq_league.name_chinese', '=', $name_chinese);
+        if(!empty($country_id)){
+            $where[] = array('st_wq_league.country_id', '=', $country_id);
         }
         if($status != 0){
             $where[] = array('st_wq_league.status', '=', $status);
@@ -195,9 +209,11 @@ class TennisLeagueController extends Controller {
         if (!$rows) {
             return responseToJson(-2003); //id????
         }
-        $row = \App\Models\Stwqlocalleague::whereIn('id', $id)->delete();
-        if (!$row) {
-            return responseToJson(-2003); //id????
+        if(count($id)>0) {
+            $row = \App\Models\Stwqlocalleague::whereIn('id', $id)->delete();
+            if (!$row) {
+                return responseToJson(-2003); //id????
+            }
         }
         return responseToJson(1, trans('menu.delete_success')); //id????
 

app/Http/Controllers/Api/WriteSportsController.php

@@ -64,10 +64,10 @@ class WriteSportsController extends BaseController{
                     foreach ($v as $kk =>$vv){
                         switch ($vv['title']){
                             case 'area'://地区
-                                throw new \Exception(Response::generate(Response::AUTH_ERROR)) ;
+                                throw new \Exception(Response::generate('地区数据-area:',Response::AUTH_ERROR)) ;
                                 break;
                             case 'country'://国家
-                                throw new \Exception(Response::generate(Response::AUTH_ERROR));
+                                throw new \Exception(Response::generate('国家数据-country:',Response::AUTH_ERROR));
                                 break;
                             case 'league'://联赛
                                 $this->league($vv);
@@ -82,14 +82,14 @@ class WriteSportsController extends BaseController{
                                 $this->league_result($vv);
                                 break;
                             case 'match_result'://赛事结果
-                                throw new \Exception(Response::generate('',Response::AUTH_ERROR));
+                                throw new \Exception(Response::generate('赛事结果数据-match_result:',Response::AUTH_ERROR));
                                 $this->match_result($vv);
                                 break;
                             case 'match_result_record'://赛事结果记录
                                 $this->com_result_record($vv);
                                 break;
                             case 'odds_record'://赔率记录
-                                throw new \Exception(Response::generate('',Response::AUTH_ERROR));
+                                throw new \Exception(Response::generate('赔率记录数据-odds_record:',Response::AUTH_ERROR));
                                 $this->odds_record($vv);
                                 break;
                             case 'broadcast'://直播数据
@@ -313,14 +313,14 @@ class WriteSportsController extends BaseController{
                     'guest_team'=>$data['guest_team']?:'no_team',
                     'lg_id'=>$lg_id,
                     'status'=>$data['status'],
-                    'match_date'=>$data['match_date']?:'',
-                    'match_time'=>$data['match_time']?:'',
+                    'match_date'=>$data['match_date']?:date('Y-m-d'),
+                    'match_time'=>$data['match_time']?:date('H:m:i'),
                     'tag'=>$data['tag']?:0,
                     'is_rollball'=>$data['is_rollball']?:0,
                     'is_today'=>$data['is_today']?:0,
                     'is_morningplate'=>$data['is_morningplate']?:0,
                     'is_stringscene'=>$data['is_stringscene']?:0,
-                    'us_time'=>$data['us_time']?:'',
+                    'us_time'=>$data['us_time']?:commonFunction::qgmdate('Y-m-d H:i:s', '', -4),
                     'half_match_id'=>$half_match_id?:0,
                 ];
                 //写入赛事 返回id
@@ -378,14 +378,13 @@ class WriteSportsController extends BaseController{
             'odds'=> $data['odds'],
             'condition'=> $data['condition'],
             'odds_only'=> $data['odds_only'],
-            'sole'=> $data['sole'],
             'source'=> $data['source'],
             'type'=> $data['type'],
-            'team'=> $data['team'],
+            'team'=> $data['team']?:'',
             'lg_id'=> $lg_id,
             'others_lg_id'=> $others_lg_id,
             'ctime'=> date('Y-m-d H:m:i'),
-            'utime'=> date('Y-m-d H:m:i'),
+
         ];
         //更新或写入赔率记录
         if(!empty($oddsID)){
@@ -537,27 +536,9 @@ class WriteSportsController extends BaseController{
 
         $match_r_id = $model['model_result_record']::where(['match_id'=>$match_id,'match_time'=>$data['match_time']])
             ->value('id');
-        $set_match_r = [
-            "home_team"=>$data['home_team'],
-            "guest_team"=>$data['guest_team'],
-            "lg_id"=>$lg_id,
-            "home_rate"=> $data['home_rate'],
-            "guest_rate"=> $data['guest_rate'],
-            "home_score"=> $data['home_score'],
-            "guest_score"=> $data['guest_score'],
-            "all_goal"=> $data['all_goal'],
-            "status"=>$data['status'],
-            "first_score"=>$data['first_score'],
-            "last_score"=> $data['last_score'],
-            "match_score"=> $data['match_score'],
-            "match_winer"=> $data['match_winer'],
-            "match_time"=> $data['match_time'],
-            "match_process"=> $data['match_process'],
-            "tag"=> $data['tag'],
-            "match_id"=> $match_id,
-            "p_code"=> $data['p_code'],
-            "update_time"=>date('Y-m-d H:m:i')
-        ];
+        //根据球类 获取 赛事结果记录字段
+        $set_match_r = $this->get_match_r($game_code,$lg_id,$match_id,$data);
+
         //赛事结果记录处理
         if($match_r_id > 0){
             $ret = $model['model_result_record']::where(['id'=>$match_r_id])
@@ -639,4 +620,101 @@ class WriteSportsController extends BaseController{
 
         return $data;
     }
+
+    //根据球类获取 赛事结果记录字段
+    public function get_match_r($game_code,$lg_id,$match_id,$data){
+        $set_match_r = [];
+        if($game_code == 'zq'){
+            $set_match_r = [
+                "home_team"=>$data['home_team'],
+                "guest_team"=>$data['guest_team'],
+                "lg_id"=>$lg_id,
+                "all_goal"=>$data['all_goal'],
+                "home_rate"=> $data['home_rate'],
+                "guest_rate"=> $data['guest_rate'],
+                "home_score"=> $data['home_score'],
+                "guest_score"=> $data['guest_score'],
+                "status"=>$data['status'],
+                "first_score"=>$data['first_score'],
+                "last_score"=> $data['last_score'],
+                "match_score"=> $data['match_score'],
+                "match_winer"=> $data['match_winer'],
+                "match_time"=> $data['match_time'],
+                "match_process"=> $data['match_process'],
+                "tag"=> $data['tag'],
+                "match_id"=> $match_id,
+                "update_time"=>date('Y-m-d H:m:i')
+            ];
+        };
+        if($game_code == 'lq'){
+            $set_match_r = [
+                "home_team"=>$data['home_team'],
+                "guest_team"=>$data['guest_team'],
+                "lg_id"=>$lg_id,
+                "home_rate"=> $data['home_rate'],
+                "guest_rate"=> $data['guest_rate'],
+                "home_score"=> $data['home_score'],
+                "guest_score"=> $data['guest_score'],
+                "status"=>$data['status'],
+                "first_score"=>$data['first_score'],
+                "last_score"=> $data['last_score'],
+                "match_score"=> $data['match_score'],
+                "match_winer"=> $data['match_winer'],
+                "match_time"=> $data['match_time'],
+                "match_process"=> $data['match_process'],
+                "tag"=> $data['tag'],
+                "match_id"=> $match_id,
+                "update_time"=>date('Y-m-d H:m:i')
+            ];
+        }
+        if($game_code == 'wq'){
+            $set_match_r = [
+                "home_player_name"=>$data['home_team'],
+                "guest_player_name"=>$data['guest_team'],
+                "lg_id"=>$lg_id,
+                "home_player_let_plate"=>$data['home_player_let_plate'],
+                "guest_player_let_plate"=>$data['guest_player_let_plate'],
+                "home_player_let_inning"=>$data['home_player_let_inning'],
+                "guest_player_let_inning"=>$data['guest_player_let_inning'],
+                "all_inning"=>$data['all_inning'],
+                "home_player_score"=>$data['home_player_score'],
+                "guest_player_score"=>$data['guest_player_score'],
+                "status"=>$data['status'],
+                "first_score_player"=>$data['first_score_player'],
+                "last_score_player"=>$data['last_score_player'],
+                "first_inning_score"=>$data['first_inning_score'],
+                "second_inning_score"=>$data['second_inning_score'],
+                "third_inning_score"=>$data['third_inning_score'],
+                "match_winer_player"=>$data['match_winer_player'],
+                "update_time"=>date('Y-m-d H:m:i'),
+                "match_time"=>$data['match_time'],
+                "match_process"=>$data['match_process'],
+                "tag"=>$data['tag'],
+                "match_id"=>$match_id,
+            ];
+        }
+        if($game_code == 'bq'){
+            $set_match_r = [
+                "home_team"=>$data['home_team'],
+                "guest_team"=>$data['guest_team'],
+                "lg_id"=>$lg_id,
+                "home_rate"=> $data['home_rate'],
+                "guest_rate"=> $data['guest_rate'],
+                "home_score"=> $data['home_score'],
+                "guest_score"=> $data['guest_score'],
+                "status"=>$data['status'],
+                "first_score"=>$data['first_score'],
+                "last_score"=> $data['last_score'],
+                "match_score"=> $data['match_score'],
+                "match_winer"=> $data['match_winer'],
+                "match_time"=> $data['match_time'],
+                "match_process"=> $data['match_process'],
+                "tag"=> $data['tag'],
+                "match_id"=> $match_id,
+                "all_inning"=>$data['all_inning'],
+                "update_time"=>date('Y-m-d H:m:i')
+            ];
+        }
+        return $set_match_r;
+    }
 }

app/Http/Model/StGameType.php

@@ -13,6 +13,7 @@ class StGameType extends Model
     protected $table = 'st_game_type';
     public $timestamps = false;
 
+    //根据球类代码 获取球类名称
     public static function getGameName($game_code= ''){
         $gameName = self::where(['game_code'=>$game_code])->value('game_name');
         return $gameName;

app/Http/Model/StWqLeague.php

@@ -12,7 +12,7 @@ use Illuminate\Database\Eloquent\Model;
 class StWqLeague extends Model
 {
 
-    protected $table = 'st_Wq_league';
+    protected $table = 'st_wq_league';
     public $timestamps = false;
 
 

app/Lib/Biz/Sport/Common.php

@@ -789,13 +789,13 @@ class Common {
                 case 'StMorningPlate'://早盘
                     $where = [
                         [$model_match.'.is_morningplate','=',1],
-                        [$model_match.'.us_time','>',$this->qgmdate('Y-m-d H:i:s', '', -4)],
+                        [$model_match.'.us_time','>',self::qgmdate('Y-m-d H:i:s', '', -4)],
                     ];
                     break;
                 case 'StStringScene'://串场 查询串场状态为1 开赛时间大于当前时间
                     $where = [
                         [$model_match.'.is_stringscene','=',1],
-                        [$model_match.'.us_time','>',$this->qgmdate('Y-m-d H:i:s', '', -4)],
+                        [$model_match.'.us_time','>',self::qgmdate('Y-m-d H:i:s', '', -4)],
                     ];
                     break;
                 case 'StChampion'://冠军
@@ -927,7 +927,7 @@ class Common {
      * @param int $timeoffset 时区偏差 默认8 北京时间 -4美东时间
      * @return string
      */
-    function qgmdate($dateformat = 'Y-m-d H:i:s', $timestamp = '', $timeoffset = 8,$type = '') {
+    public static function qgmdate($dateformat = 'Y-m-d H:i:s', $timestamp = '', $timeoffset = 8,$type = '') {
         if(empty($timestamp)) {
             $timestamp = time();
         }

app/Lib/Settlement/Adapter/ZqRule.php

@@ -7,6 +7,7 @@
  */
 
 namespace App\Lib\Settlement\Adapter;
+
 use Illuminate\Support\Facades\DB;
 
 
@@ -19,8 +20,9 @@ class ZqRule
      * @param mixed $resultRecords 结果记录表数据
      * @return string 1：赢  -1：输  2：平  3：赢半平半  4：输半平半
      */
-    public function concede_home($model, $resultModel, $resultRecords) {
-        return $this -> concedeFull($model, $resultModel, $resultRecords, 1);
+    public function concede_home($model, $resultModel, $resultRecords)
+    {
+        return $this->concedeFull($model, $resultModel, $resultRecords, 1);
     }
 
     /**
@@ -30,8 +32,9 @@ class ZqRule
      * @param mixed $resultRecords 结果记录表数据
      * @return string 1：赢  -1：输  2：平  3：赢半平半  4：输半平半
      */
-    public function concede_guest($model, $resultModel, $resultRecords) {
-        return $this -> concedeFull($model, $resultModel, $resultRecords, 2);
+    public function concede_guest($model, $resultModel, $resultRecords)
+    {
+        return $this->concedeFull($model, $resultModel, $resultRecords, 2);
     }
 
     /**
@@ -41,8 +44,9 @@ class ZqRule
      * @param mixed $resultRecords 结果记录表数据
      * @return string 1：赢  -1：输  2：平  3：赢半平半  4：输半平半
      */
-    public function half_concede_home($model, $resultModel, $resultRecords) {
-        return $this -> concedeHalf($model, $resultModel, $resultRecords, 1, 1);
+    public function half_concede_home($model, $resultModel, $resultRecords)
+    {
+        return $this->concedeHalf($model, $resultModel, $resultRecords, 1, 1);
     }
 
     /**
@@ -52,8 +56,9 @@ class ZqRule
      * @param mixed $resultRecords 结果记录表数据
      * @return string 1：赢  -1：输  2：平  3：赢半平半  4：输半平半
      */
-    public function half_concede_guest($model, $resultModel, $resultRecords) {
-        return $this -> concedeHalf($model, $resultModel, $resultRecords, 2, 1);
+    public function half_concede_guest($model, $resultModel, $resultRecords)
+    {
+        return $this->concedeHalf($model, $resultModel, $resultRecords, 2, 1);
     }
 
     /**
@@ -63,8 +68,9 @@ class ZqRule
      * @param mixed $resultRecords 结果记录表数据
      * @return string 1：赢  -1：输  2：平  3：赢半平半  4：输半平半
      */
-    public function goal_size_home($model, $resultModel, $resultRecords) {
-        return $this -> sizeFull($model, $resultModel, $resultRecords, 0, 1);
+    public function goal_size_home($model, $resultModel, $resultRecords)
+    {
+        return $this->sizeFull($model, $resultModel, $resultRecords, 0, 1);
     }
 
     /**
@@ -74,8 +80,9 @@ class ZqRule
      * @param mixed $resultRecords 结果记录表数据
      * @return string 1：赢  -1：输  2：平  3：赢半平半  4：输半平半
      */
-    public function goal_size_guest($model, $resultModel, $resultRecords) {
-        return $this -> sizeFull($model, $resultModel, $resultRecords, 0, -1);
+    public function goal_size_guest($model, $resultModel, $resultRecords)
+    {
+        return $this->sizeFull($model, $resultModel, $resultRecords, 0, -1);
     }
 
     /**
@@ -85,8 +92,9 @@ class ZqRule
      * @param mixed $resultRecords 结果记录表数据
      * @return string 1：赢  -1：输  2：平  3：赢半平半  4：输半平半
      */
-    public function half_goal_size_home($model, $resultModel, $resultRecords) {
-        return $this -> sizeHalf($model, $resultModel, $resultRecords, 0, 1, 1);
+    public function half_goal_size_home($model, $resultModel, $resultRecords)
+    {
+        return $this->sizeHalf($model, $resultModel, $resultRecords, 0, 1, 1);
     }
 
     /**
@@ -96,8 +104,9 @@ class ZqRule
      * @param mixed $resultRecords 结果记录表数据
      * @return string 1：赢  -1：输  2：平  3：赢半平半  4：输半平半
      */
-    public function half_goal_size_guest($model, $resultModel, $resultRecords) {
-        return $this -> sizeHalf($model, $resultModel, $resultRecords, 0, -1, 1);
+    public function half_goal_size_guest($model, $resultModel, $resultRecords)
+    {
+        return $this->sizeHalf($model, $resultModel, $resultRecords, 0, -1, 1);
     }
 
     /**
@@ -107,8 +116,9 @@ class ZqRule
      * @param mixed $resultRecords 结果记录表数据
      * @return string 1：赢  -1：输
      */
-    public function capot_home($model, $resultModel, $resultRecords) {
-        return $this -> winFull($model, $resultModel, $resultRecords, 1);
+    public function capot_home($model, $resultModel, $resultRecords)
+    {
+        return $this->winFull($model, $resultModel, $resultRecords, 1);
     }
 
     /**
@@ -118,8 +128,9 @@ class ZqRule
      * @param mixed $resultRecords 结果记录表数据
      * @return string 1：赢  -1：输
      */
-    public function capot_guest($model, $resultModel, $resultRecords) {
-        return $this -> winFull($model, $resultModel, $resultRecords, 2);
+    public function capot_guest($model, $resultModel, $resultRecords)
+    {
+        return $this->winFull($model, $resultModel, $resultRecords, 2);
     }
 
     /**
@@ -129,8 +140,9 @@ class ZqRule
      * @param mixed $resultRecords 结果记录表数据
      * @return string 1：赢  -1：输
      */
-    public function capot_dogfall($model, $resultModel, $resultRecords) {
-        return $this -> winFull($model, $resultModel, $resultRecords, 0);
+    public function capot_dogfall($model, $resultModel, $resultRecords)
+    {
+        return $this->winFull($model, $resultModel, $resultRecords, 0);
     }
 
     /**
@@ -140,8 +152,9 @@ class ZqRule
      * @param mixed $resultRecords 结果记录表数据
      * @return string 1：赢  -1：输
      */
-    public function half_capot_home($model, $resultModel, $resultRecords) {
-        return $this -> winHalf($model, $resultModel, $resultRecords, 1, 1);
+    public function half_capot_home($model, $resultModel, $resultRecords)
+    {
+        return $this->winHalf($model, $resultModel, $resultRecords, 1, 1);
     }
 
     /**
@@ -151,8 +164,9 @@ class ZqRule
      * @param mixed $resultRecords 结果记录表数据
      * @return string 1：赢  -1：输
      */
-    public function half_capot_guest($model, $resultModel, $resultRecords) {
-        return $this -> winHalf($model, $resultModel, $resultRecords, 2, 1);
+    public function half_capot_guest($model, $resultModel, $resultRecords)
+    {
+        return $this->winHalf($model, $resultModel, $resultRecords, 2, 1);
     }
 
     /**
@@ -162,8 +176,9 @@ class ZqRule
      * @param mixed $resultRecords 结果记录表数据
      * @return string 1：赢  -1：输
      */
-    public function half_capot_dogfall($model, $resultModel, $resultRecords) {
-        return $this -> winHalf($model, $resultModel, $resultRecords, 0, 1);
+    public function half_capot_dogfall($model, $resultModel, $resultRecords)
+    {
+        return $this->winHalf($model, $resultModel, $resultRecords, 0, 1);
     }
 
     /**
@@ -175,11 +190,12 @@ class ZqRule
      * @param mixed $size 1：大 -1：小（如果是让球大小玩法才传入该字段）
      * @return string 1：赢  -1：输  2：平  3：赢半平半  4：输半平半
      */
-    public function concedeFull($model, $resultModel, $resultRecords, $type, $size = ''){
-         // 主队得分
-        $homeScore = intval($resultModel -> home_score);
+    public function concedeFull($model, $resultModel, $resultRecords, $type, $size = '')
+    {
+        // 主队得分
+        $homeScore = intval($resultModel->home_score);
         // 客队得分
-        $guestScore = intval($resultModel -> guest_score);
+        $guestScore = intval($resultModel->guest_score);
         $difference = 0;
         // 分差 - 主 ：客
         if ($type == 1) {
@@ -189,12 +205,12 @@ class ZqRule
             $difference = $guestScore - $homeScore;
         }
         // 让球个数
-        $condition = explode("/", $model -> condition);
+        $condition = explode("/", $model->condition);
         $resultArr = [];
         // 循环对比让球后输赢
         foreach ($condition as $value) {
             $absValue = abs($value);
-            if (substr($model -> condition, 0, 1) == '-') {
+            if (substr($model->condition, 0, 1) == '-') {
                 $resultScore = $difference - $absValue;
             } else {
                 $resultScore = $difference + $absValue;
@@ -236,7 +252,7 @@ class ZqRule
         }
         $data['matchResult'] = "$homeScore-$guestScore(全场)";
         return $data;
-     }
+    }
 
     /**
      * 半场|[主、客]|让球
@@ -248,7 +264,8 @@ class ZqRule
      * @param mixed $size 1：大 -1：小（如果是让球大小玩法才传入该字段）
      * @return string 1：赢  -1：输  2：平  3：赢半平半  4：输半平半
      */
-    public function concedeHalf($model, $resultModel, $resultRecords, $whoType, $halfType, $size = ''){
+    public function concedeHalf($model, $resultModel, $resultRecords, $whoType, $halfType, $size = '')
+    {
         $half = [1 => '上半场', 2 => '下半场'];
         // 倒叙
         $newResultRecords = array_reverse($resultRecords);
@@ -258,16 +275,16 @@ class ZqRule
         $guestScore = 0;
         if ($halfType == 1) {
             // 主队得分
-            $homeScore = intval($newResultRecords[$upResultKey] -> home_score);
+            $homeScore = intval($newResultRecords[$upResultKey]->home_score);
             // 客队得分
-            $guestScore = intval($newResultRecords[$upResultKey] -> guest_score);
+            $guestScore = intval($newResultRecords[$upResultKey]->guest_score);
         } else {
             // 查询最后的下半场的key值
             $downResultKey = array_search($half[2], array_column($newResultRecords, 'match_process'));
             // 下半场主队得分
-            $homeScore = intval($newResultRecords[$downResultKey] -> home_score) - intval($newResultRecords[$upResultKey] -> home_score);
+            $homeScore = intval($newResultRecords[$downResultKey]->home_score) - intval($newResultRecords[$upResultKey]->home_score);
             // 下半场客队得分
-            $guestScore = intval($newResultRecords[$downResultKey] -> guest_score) - intval($newResultRecords[$upResultKey] -> guest_score);
+            $guestScore = intval($newResultRecords[$downResultKey]->guest_score) - intval($newResultRecords[$upResultKey]->guest_score);
         }
         $difference = 0;
         // 分差 - 主 ：客
@@ -278,12 +295,12 @@ class ZqRule
             $difference = $guestScore - $homeScore;
         }
         // 让球个数
-        $condition = explode("/", $model -> condition);
+        $condition = explode("/", $model->condition);
         $resultArr = [];
         // 循环对比让球后输赢
         foreach ($condition as $value) {
             $absValue = abs($value);
-            if (substr($model -> condition, 0, 1) == '-') {
+            if (substr($model->condition, 0, 1) == '-') {
                 $resultScore = $difference - $absValue;
             } else {
                 $resultScore = $difference + $absValue;
@@ -326,7 +343,7 @@ class ZqRule
         }
         $data['matchResult'] = "$homeScore-$guestScore(上半场)";
         return $data;
-     }
+    }
 
     /**
      * 总进球全场|[主、客、全]|大小
@@ -337,15 +354,16 @@ class ZqRule
      * @param mixed $size 1：大  -1：小
      * @return string 1：赢  -1：输  2：平  3：赢半平半  4：输半平半
      */
-    public function sizeFull($model, $resultModel, $resultRecords, $type, $size){
+    public function sizeFull($model, $resultModel, $resultRecords, $type, $size)
+    {
         // 总进球数
-        $allGoal = intval($resultModel -> home_score) + intval($resultModel -> guest_score);
+        $allGoal = intval($resultModel->home_score) + intval($resultModel->guest_score);
         // 主队进球数
-        $homeGoal = intval($resultModel -> home_score);
+        $homeGoal = intval($resultModel->home_score);
         // 客队进球数
-        $guestGoal = intval($resultModel -> guest_score);
+        $guestGoal = intval($resultModel->guest_score);
         // 条件
-        $condition = explode("/", $model -> condition);
+        $condition = explode("/", $model->condition);
         $resultArr = [];
         // 循环对比输赢
         foreach ($condition as $value) {
@@ -401,7 +419,8 @@ class ZqRule
      * @param mixed $halfType 1：上半场   2：下半场
      * @return string 1：赢  -1：输  2：平  3：赢半平半  4：输半平半
      */
-    public function sizeHalf($model, $resultModel, $resultRecords, $type, $size, $halfType){
+    public function sizeHalf($model, $resultModel, $resultRecords, $type, $size, $halfType)
+    {
         $half = [1 => '上半场', 2 => '下半场'];
         // 倒叙
         $newResultRecords = array_reverse($resultRecords);
@@ -409,24 +428,24 @@ class ZqRule
         $upResultKey = array_search($half[1], array_column($newResultRecords, 'match_process'));
         if ($halfType == 1) {
             // 上半场总进球数
-            $allGoal = intval($newResultRecords[$upResultKey] -> home_score) + intval($newResultRecords[$upResultKey] -> guest_score);
+            $allGoal = intval($newResultRecords[$upResultKey]->home_score) + intval($newResultRecords[$upResultKey]->guest_score);
             // 上半场主队进球数
-            $homeGoal = intval($newResultRecords[$upResultKey] -> home_score);
+            $homeGoal = intval($newResultRecords[$upResultKey]->home_score);
             // 上半场客队进球数
-            $guestGoal = intval($newResultRecords[$upResultKey] -> guest_score);
+            $guestGoal = intval($newResultRecords[$upResultKey]->guest_score);
         } else {
             // 查询最后的下半场的key值
             $downResultKey = array_search($half[2], array_column($newResultRecords, 'match_process'));
             // 下半场总进球数
-            $allGoal = intval($newResultRecords[$downResultKey] -> home_score) + intval($newResultRecords[$downResultKey] -> guest_score) -
-                intval($newResultRecords[$upResultKey] -> home_score) + intval($newResultRecords[$upResultKey] -> guest_score);
+            $allGoal = intval($newResultRecords[$downResultKey]->home_score) + intval($newResultRecords[$downResultKey]->guest_score) -
+                intval($newResultRecords[$upResultKey]->home_score) + intval($newResultRecords[$upResultKey]->guest_score);
             // 下半场主队进球数
-            $homeGoal = intval($newResultRecords[$downResultKey] -> home_score) - intval($newResultRecords[$upResultKey] -> home_score);
+            $homeGoal = intval($newResultRecords[$downResultKey]->home_score) - intval($newResultRecords[$upResultKey]->home_score);
             // 下半场客队进球数
-            $guestGoal = intval($newResultRecords[$downResultKey] -> guest_score) - intval($newResultRecords[$upResultKey] -> guest_score);
+            $guestGoal = intval($newResultRecords[$downResultKey]->guest_score) - intval($newResultRecords[$upResultKey]->guest_score);
         }
         // 条件
-        $condition = explode("/", $model -> condition);
+        $condition = explode("/", $model->condition);
         $resultArr = [];
         // 循环对比输赢
         foreach ($condition as $value) {
@@ -480,11 +499,12 @@ class ZqRule
      * @param mixed $type 1：主队  2：客队 0：平
      * @return string 1：赢  -1：输
      */
-    public function winFull($model, $resultModel, $resultRecords, $type){
+    public function winFull($model, $resultModel, $resultRecords, $type)
+    {
         // 主队得分
-        $homeScore = intval($resultModel -> home_score);
+        $homeScore = intval($resultModel->home_score);
         // 客队得分
-        $guestScore = intval($resultModel -> guest_score);
+        $guestScore = intval($resultModel->guest_score);
         $difference = $homeScore - $guestScore;
         if ($difference > 0 && $type == 1) {
             $data['result'] = 1;
@@ -508,7 +528,8 @@ class ZqRule
      * @param mixed $halfType 1：上半场   2：下半场
      * @return string 1：赢  -1：输
      */
-    public function winHalf($model, $resultModel, $resultRecords, $type, $halfType){
+    public function winHalf($model, $resultModel, $resultRecords, $type, $halfType)
+    {
         $half = [1 => '上半场', 2 => '下半场'];
         // 倒叙
         $newResultRecords = array_reverse($resultRecords);
@@ -518,16 +539,16 @@ class ZqRule
         $guestScore = 0;
         if ($halfType == 1) {
             // 主队得分
-            $homeScore = intval($newResultRecords[$upResultKey] -> home_score);
+            $homeScore = intval($newResultRecords[$upResultKey]->home_score);
             // 客队得分
-            $guestScore = intval($newResultRecords[$upResultKey] -> guest_score);
+            $guestScore = intval($newResultRecords[$upResultKey]->guest_score);
         } else {
             // 查询最后的下半场的key值
             $downResultKey = array_search($half[2], array_column($newResultRecords, 'match_process'));
             // 下半场主队得分
-            $homeScore = intval($newResultRecords[$downResultKey] -> home_score) - intval($newResultRecords[$upResultKey] -> home_score);
+            $homeScore = intval($newResultRecords[$downResultKey]->home_score) - intval($newResultRecords[$upResultKey]->home_score);
             // 下半场客队得分
-            $guestScore = intval($newResultRecords[$downResultKey] -> guest_score) - intval($newResultRecords[$upResultKey] -> guest_score);
+            $guestScore = intval($newResultRecords[$downResultKey]->guest_score) - intval($newResultRecords[$upResultKey]->guest_score);
         }
         $difference = $homeScore - $guestScore;
         if ($difference > 0 && $type == 1) {
@@ -545,56 +566,72 @@ class ZqRule
 
     //  first_last_ball最先/最后进球 开始-----------------------
     //主队|最先进球
-    public  function  first_ball_home($model,$resultModel,$resultRecords){
-        if ($resultModel->all_goal >0){
-            if  ($resultModel->first_score === $resultModel->home_team){
-                return ['result'=>1,'matchResult'=>''];
-            }else{
-                return ['result'=>-1,'matchResult'=>''];
+    public function first_ball_home($model, $resultModel, $resultRecords)
+    {
+        $resultModel = $resultModel['0'];
+        if ($resultModel->all_goal > 0) {
+            if ($resultModel->first_score === $resultModel->home_team) {
+                return ['result' => 1, 'matchResult' => ''];
+            } else {
+                return ['result' => -1, 'matchResult' => ''];
             }
-		}
-        return ['result'=>2,'matchResult'=>''] ;
+        }
+        return ['result' => 2, 'matchResult' => ''];
     }
+
     //客队|最先进球
-    public  function  first_ball_guest($model,$resultModel,$resultRecords){
-        if ($resultModel->all_goal >0){
-            if  ($resultModel->first_score === $resultModel->guest_team){
-                return ['result'=>1,'matchResult'=>''];
-            }else{
-                return ['result'=>-1,'matchResult'=>''] ;
+    public function first_ball_guest($model, $resultModel, $resultRecords)
+    {
+        $resultModel = $resultModel['0'];
+        if ($resultModel->all_goal > 0) {
+            if ($resultModel->first_score === $resultModel->guest_team) {
+                return ['result' => 1, 'matchResult' => ''];
+            } else {
+                return ['result' => -1, 'matchResult' => ''];
             }
-		}
-        return ['result'=>2,'matchResult'=>''] ;
+        }
+        return ['result' => 2, 'matchResult' => ''];
     }
+
     //主队|最后进球
-    public  function  last_ball_home($model,$resultModel,$resultRecords){
-        if ($resultModel->all_goal >0){
-            if  ($resultModel->last_score === $resultModel->home_team){
-                return ['result'=>1,'matchResult'=>''];
-            }else{
-                return ['result'=>-1,'matchResult'=>''] ;
+    public function last_ball_home($model, $resultModel, $resultRecords)
+    {
+        $resultModel = $resultModel['0'];
+        if ($resultModel->all_goal > 0) {
+            if ($resultModel->last_score === $resultModel->home_team) {
+                return ['result' => 1, 'matchResult' => ''];
+            } else {
+                return ['result' => -1, 'matchResult' => ''];
             }
-		}
-        return ['result'=>2,'matchResult'=>''] ;
+        }
+        return ['result' => 2, 'matchResult' => ''];
 
     }
+
     //客队|最后进球
-    public  function  last_ball_guest($model,$resultModel,$resultRecords){
-        if ($resultModel->all_goal >0){
-            if  ($resultModel->last_score === $resultModel->guest_team){
-                return ['result'=>1,'matchResult'=>''];
-            }else{
-                return ['result'=>-1,'matchResult'=>''] ;
+    public function last_ball_guest($model, $resultModel, $resultRecords)
+    {
+        $pos = count($resultModel) -1 ;
+        $resultModel = $resultModel[$pos];
+        if ($resultModel->all_goal > 0) {
+            if ($resultModel->last_score === $resultModel->guest_team) {
+                return ['result' => 1, 'matchResult' => ''];
+            } else {
+                return ['result' => -1, 'matchResult' => ''];
             }
-		}
-        return ['result'=>2,'matchResult'=>''] ;
+        }
+        return ['result' => 2, 'matchResult' => ''];
     }
+
     //没有进球
-    public  function  not_ball($model,$resultModel,$resultRecords){
-        if ($resultModel->all_goal <=0){
-            return ['result'=>1,'matchResult'=>''] ;
-        }else{
-            return ['result'=>-1,'matchResult'=>''] ;
+    public function not_ball($model, $resultModel, $resultRecords)
+    {
+        $pos = count($resultModel) -1 ;
+        $resultModel = $resultModel[$pos];
+        if ($resultModel->all_goal <= 0) {
+            return ['result' => 1, 'matchResult' => ''];
+        } else {
+            return ['result' => -1, 'matchResult' => ''];
         }
 
     }
@@ -606,7 +643,8 @@ class ZqRule
      * @param $result_match  最终结果
      * @param $result_match_r  结果记录
      */
-    public function bodan($bet_match,$result_match,$result_match_r){
+    public function bodan($bet_match, $result_match, $result_match_r)
+    {
 //        $bet_match = DB::table('money_buy_match')->where('match_id', 3150765)->first();
 //        $result_match = DB::table('st_zq_result')->where('match_id', 3150765)->first();
 //        $result_match_r = DB::table('st_zq_result_record')->where('match_id', 3150765)->get()->toArray();
@@ -619,9 +657,9 @@ class ZqRule
         $bet_score = explode('-', $bet_match->condition);
         $bet_home_score = (int)$bet_score[0];
         $bet_guest_score = (int)$bet_score[1];
-        if($p_code != 'bodan') return false;
+        if ($p_code != 'bodan') return false;
 
-        if(strstr($odds_code,"half")){//上半场
+        if (strstr($odds_code, "half")) {//上半场
             //获取上半场最终数据
             $last_half_data = $this->getHalfData($result_match_r);
             //获取主客队上半场得分
@@ -629,41 +667,37 @@ class ZqRule
             $guest_score = $last_half_data->guest_score;
             //返回结果
             $data = [
-                'result'=>1,
-                'matchResult'=>"$home_score-$guest_score(上半场)"
+                'result' => 1,
+                'matchResult' => "$home_score-$guest_score(上半场)"
             ];
-            if(strstr($bet_match->condition,"其他") ){
-                if(($home_score > 3) ||  ($guest_score > 3))
-                {
+            if (strstr($bet_match->condition, "其他")) {
+                if (($home_score > 3) || ($guest_score > 3)) {
                     return $data;
                 }
             }
             //判断结果
-            if($bet_home_score == $home_score and $bet_guest_score == $guest_score)
-            {
+            if ($bet_home_score == $home_score and $bet_guest_score == $guest_score) {
                 return $data;
             }
             $data['result'] = -1;
             return $data;
-        }else{//全场
+        } else {//全场
             //获取主客队全场得分
             $home_score = $result_match->home_score;
             $guest_score = $result_match->guest_score;
 
             //返回结果
             $data = [
-                'result'=>1,
-                'matchResult'=>"$home_score-$guest_score(全场)"
+                'result' => 1,
+                'matchResult' => "$home_score-$guest_score(全场)"
             ];
-            if(strstr($bet_match->condition,"其他") ){
-                if(($home_score > 4) ||  ($guest_score > 4))
-                {
+            if (strstr($bet_match->condition, "其他")) {
+                if (($home_score > 4) || ($guest_score > 4)) {
                     return $data;
                 }
             }
             //判断结果
-            if($bet_home_score == $home_score and $bet_guest_score == $guest_score)
-            {
+            if ($bet_home_score == $home_score and $bet_guest_score == $guest_score) {
                 return $data;
             }
             $data['result'] = -1;
@@ -672,132 +706,134 @@ class ZqRule
     }
 
     //结果单/双 home_score 主队进球数 guest_score 客队进球数 home_rate 主队让球 guest_rate 客队让球 u_home_score 上半场主队进球 u_guest_score 上半场-客队进球数  two_sides_single 全场单 two_sides_double 全场双 half_two_sides_single 上半场单 half_two_sides_double 上半场双
-    public function  two_sides($model,$resultModel,$resultRecords){
+    public function two_sides($model, $resultModel, $resultRecords)
+    {
         $resulttod = intval($resultModel->home_score) + intval($resultModel->guest_score);//全场
 
-        if($resulttod%2==0){
+        if ($resulttod % 2 == 0) {
             $text = '双';
-        }else{
+        } else {
             $text = '单';
         }
 
-        if($model->odds_code == "two_sides_single"){
-            if($text == $model->condition){
-                $dsresult =1;
-            }else{
+        if ($model->odds_code == "two_sides_single") {
+            if ($text == $model->condition) {
+                $dsresult = 1;
+            } else {
                 $dsresult = -1;
             }
-        }elseif($model->odds_code == 'two_sides_double'){
-            if($text == $model->condition){
-                $dsresult =1;
-            }else{
+        } elseif ($model->odds_code == 'two_sides_double') {
+            if ($text == $model->condition) {
+                $dsresult = 1;
+            } else {
                 $dsresult = -1;
             }
-        }else{
+        } else {
             $data = [
-                'result'=>100,
-                'matchResult'=>"参数不存在",
+                'result' => 100,
+                'matchResult' => "参数不存在",
             ];
         }
 
-        if($dsresult==1){
+        if ($dsresult == 1) {
             $data = [
-                'result'=>1,
-                'matchResult'=>"$resulttod(全场)",
+                'result' => 1,
+                'matchResult' => "$resulttod(全场)",
             ];
-        }else{
+        } else {
             $data = [
-                'result'=>-1,
-                'matchResult'=>"$resulttod(全场)",
+                'result' => -1,
+                'matchResult' => "$resulttod(全场)",
             ];
         }
         return $data;
 
     }
- 
+
 
     //结果总数 home_score 主队进球数 guest_score 客队进球数 home_rate 主队让球 guest_rate 客队让球 u_home_score 上半场-主队进球数 u_guest_score 上半场-客队进球数
-    public function  total_goal($model,$resultModel,$resultRecords){
+    public function total_goal($model, $resultModel, $resultRecords)
+    {
         //全场总进球数
         $resulttod = intval($resultModel->home_score) + intval($resultModel->guest_score);
         //上半场总进球数
         $Firsthalftod = intval($resultModel->u_home_score) + intval($resultModel->u_guest_score);
-       
+
         $qjnum = explode('-', $model->condition);
-        if($model->odds_code = "total_goal_four"){
-            if($qjnum[0]<=$resulttod and $qjnum[1]>=$resulttod){
+        if ($model->odds_code = "total_goal_four") {
+            if ($qjnum[0] <= $resulttod and $qjnum[1] >= $resulttod) {
                 $results = 1;
-            }else{
+            } else {
                 $results = -1;
             }
-        }elseif($model->odds_code = "total_goal_zero"){
-            if($qjnum[0]<=$resulttod and $qjnum[1]>=$resulttod){
+        } elseif ($model->odds_code = "total_goal_zero") {
+            if ($qjnum[0] <= $resulttod and $qjnum[1] >= $resulttod) {
                 $results = 1;
-            }else{
+            } else {
                 $results = -1;
             }
-        }elseif($model->odds_code = "total_goal_two"){
-            if($qjnum[0]<=$resulttod and $qjnum[1]>=$resulttod){
+        } elseif ($model->odds_code = "total_goal_two") {
+            if ($qjnum[0] <= $resulttod and $qjnum[1] >= $resulttod) {
                 $results = 1;
-            }else{
+            } else {
                 $results = -1;
             }
-        }elseif($model->odds_code = "total_goal_seven"){
-            if($qjnum[0]<=$resulttod and $qjnum[1]>=$resulttod){
+        } elseif ($model->odds_code = "total_goal_seven") {
+            if ($qjnum[0] <= $resulttod and $qjnum[1] >= $resulttod) {
                 $results = 1;
-            }else{
+            } else {
                 $results = -1;
             }
-        }elseif($model->odds_code = "half_total_goal_zero"){
-            if($qjnum[0]<=$Firsthalftod and $qjnum[1]>=$Firsthalftod){
+        } elseif ($model->odds_code = "half_total_goal_zero") {
+            if ($qjnum[0] <= $Firsthalftod and $qjnum[1] >= $Firsthalftod) {
                 $resultb = 1;
-            }else{
+            } else {
                 $resultb = -1;
             }
-        }elseif($model->odds_code = "half_total_goal_one"){
-            if($qjnum[0]<=$Firsthalftod and $qjnum[1]>=$Firsthalftod){
+        } elseif ($model->odds_code = "half_total_goal_one") {
+            if ($qjnum[0] <= $Firsthalftod and $qjnum[1] >= $Firsthalftod) {
                 $resultb = 1;
-            }else{
+            } else {
                 $resultb = -1;
             }
-        }elseif($model->odds_code = "half_total_goal_two"){
-            if($qjnum[0]<=$Firsthalftod and $qjnum[1]>=$Firsthalftod){
+        } elseif ($model->odds_code = "half_total_goal_two") {
+            if ($qjnum[0] <= $Firsthalftod and $qjnum[1] >= $Firsthalftod) {
                 $resultb = 1;
-            }else{
+            } else {
                 $resultb = -1;
             }
-        }elseif($model->odds_code = "half_total_goal_three"){
-            if($qjnum[0]<=$Firsthalftod and $qjnum[1]>=$Firsthalftod){
+        } elseif ($model->odds_code = "half_total_goal_three") {
+            if ($qjnum[0] <= $Firsthalftod and $qjnum[1] >= $Firsthalftod) {
                 $resultb = 1;
-            }else{
+            } else {
                 $resultb = -1;
             }
-        }else{
+        } else {
             $data = [
-                'result'=>100,
-                'matchResult'=>"参数不存在",
+                'result' => 100,
+                'matchResult' => "参数不存在",
             ];
         }
 
-        if($results==1){
+        if ($results == 1) {
             $data = [
-                'result'=>1,
-                'matchResult'=>"$resulttod(全场)",
+                'result' => 1,
+                'matchResult' => "$resulttod(全场)",
             ];
-        }elseif($results == -1){
+        } elseif ($results == -1) {
             $data = [
-                'result'=>-1,
-                'matchResult'=>"$resulttod(全场)",
+                'result' => -1,
+                'matchResult' => "$resulttod(全场)",
             ];
-        }elseif($resultb==1){
+        } elseif ($resultb == 1) {
             $data = [
-                'result'=>1,
-                'matchResult'=>"$resulttod(半场)",
+                'result' => 1,
+                'matchResult' => "$resulttod(半场)",
             ];
-        }elseif($resultb == -1){
+        } elseif ($resultb == -1) {
             $data = [
-                'result'=>-1,
-                'matchResult'=>"$resulttod(半场)",
+                'result' => -1,
+                'matchResult' => "$resulttod(半场)",
             ];
         }
         return $data;
@@ -806,11 +842,12 @@ class ZqRule
     /**
      * 半场/全场 投注规则
      */
-    public function half_full($bet_match,$result_match,$result_match_r){
+    public function half_full($bet_match, $result_match, $result_match_r)
+    {
 //        $bet_match = DB::table('money_buy_match')->where('match_id', 3210851)->first();
 //        $result_match = DB::table('st_zq_result')->where('match_id', 3210851)->first();
 //        $result_match_r = DB::table('st_zq_result_record')->where('match_id', 3210851)->get()->toArray();
-        if(empty($bet_match) || empty($result_match) || empty($result_match_r)) return false;
+        if (empty($bet_match) || empty($result_match) || empty($result_match_r)) return false;
 
         //获取父/子级赔率代码
         $p_code = $bet_match->p_code;
@@ -826,40 +863,40 @@ class ZqRule
         $full_home_score = $result_match->home_score;
         $full_guest_score = $result_match->guest_score;
         //半场/全场盘口
-        if($p_code != 'half_full') return false;
+        if ($p_code != 'half_full') return false;
 
         //返回结果
         $data = [
-            'result'=>1,
-            'matchResult'=>"$half_home_score-$half_home_score(上半场);$full_home_score-$full_guest_score(全场)"
+            'result' => 1,
+            'matchResult' => "$half_home_score-$half_home_score(上半场);$full_home_score-$full_guest_score(全场)"
         ];
-        switch ($odds_code ) {
+        switch ($odds_code) {
             case 'half_full_home_home':// 主-主
-                if($half_home_score > $half_home_score and $full_home_score > $full_guest_score) return $data;
+                if ($half_home_score > $half_home_score and $full_home_score > $full_guest_score) return $data;
                 break;
             case 'half_full_home_dogfall':// 主-和
-                if($half_home_score > $half_guest_score and $full_home_score == $full_guest_score) return $data;
+                if ($half_home_score > $half_guest_score and $full_home_score == $full_guest_score) return $data;
                 break;
             case 'half_full_home_guest':// 主-客
-                if($half_home_score > $half_guest_score and $full_home_score < $full_guest_score) return $data;
+                if ($half_home_score > $half_guest_score and $full_home_score < $full_guest_score) return $data;
                 break;
             case 'half_full_dogfall_home':// 和-主
-                if($half_home_score == $half_guest_score and $full_home_score > $full_guest_score) return $data;
+                if ($half_home_score == $half_guest_score and $full_home_score > $full_guest_score) return $data;
                 break;
             case 'half_full_dogfall_dogfall':// 和-和
-                if($half_home_score == $half_guest_score and $full_home_score == $full_guest_score) return $data;
+                if ($half_home_score == $half_guest_score and $full_home_score == $full_guest_score) return $data;
                 break;
             case 'half_full_dogfall_guest':// 和-客
-                if($half_home_score == $half_guest_score and $full_home_score < $full_guest_score) return $data;
+                if ($half_home_score == $half_guest_score and $full_home_score < $full_guest_score) return $data;
                 break;
             case 'half_full_guest_home':// 客-主
-                if($half_home_score < $half_guest_score and $full_home_score > $full_guest_score) return $data;
+                if ($half_home_score < $half_guest_score and $full_home_score > $full_guest_score) return $data;
                 break;
             case 'half_full_guest_dogfall':// 客-和
-                if($half_home_score < $half_guest_score and $full_home_score == $full_guest_score) return $data;
+                if ($half_home_score < $half_guest_score and $full_home_score == $full_guest_score) return $data;
                 break;
             case 'half_full_guest_guest':// 客-客
-                if($half_home_score < $half_guest_score and $full_home_score < $full_guest_score) return $data;
+                if ($half_home_score < $half_guest_score and $full_home_score < $full_guest_score) return $data;
                 break;
             default:
                 return false;
@@ -873,22 +910,23 @@ class ZqRule
      * @param $result_match_r 赛事结果记录
      * @return mixed 返回最新一条上半场结果数据
      */
-    public function getHalfData($result_match_r=[]){
-        if(empty($result_match_r))  return false;
+    public function getHalfData($result_match_r = [])
+    {
+        if (empty($result_match_r)) return false;
         $half_data = [];
-        foreach ($result_match_r as $k=>$v){
+        foreach ($result_match_r as $k => $v) {
             //取出上半场数据
-            if($v->match_process == '上半场'){
+            if ($v->match_process == '上半场') {
                 $half_data[] = $v;
             }
         }
         //根据id倒序排列
-        $half_data_sorc = array_column($half_data,'id');
-        array_multisort($half_data_sorc,SORT_DESC,$half_data);
+        $half_data_sorc = array_column($half_data, 'id');
+        array_multisort($half_data_sorc, SORT_DESC, $half_data);
 
         //获取id最大的一条数据
-        foreach ($half_data as $k=>$v){
-            if($v->id == $half_data_sorc[0]){
+        foreach ($half_data as $k => $v) {
+            if ($v->id == $half_data_sorc[0]) {
                 $last_half_data = $v;
             }
         }
@@ -902,57 +940,54 @@ class ZqRule
      * $result_match 联赛结果 数据 根据玩法代码查询一条
      * $result_match_r 无用参数
      */
-    public function gj($bet_match,$result_match,$result_match_r){
+    public function gj($bet_match, $result_match, $result_match_r)
+    {
 
 //        $bet_match = DB::table('money_buy_match')->where('match_id', 127317)->first();
 //        $bet_match->odds_code = '巴西小组赛积分成绩';
 
 //        $result_match = DB::table('st_zq_league_result')->where(['lg_id'=>27317,'game_name'=>$bet_match->odds_code])->first();
 
-        if(empty($bet_match) || empty($result_match) ) return false;
-        if($bet_match->p_code != 'gj') return false;//冠军玩法
+        if (empty($bet_match) || empty($result_match)) return false;
+        if ($bet_match->p_code != 'gj') return false;//冠军玩法
 
-        if($bet_match->odds_code == $result_match->game_name){
+        if ($bet_match->odds_code == $result_match->game_name) {
             $condition = $bet_match->condition;
 
             //进球数判断
-            if(strpos($bet_match->odds_code,'进球数') !== false){
+            if (strpos($bet_match->odds_code, '进球数') !== false) {
                 //返回结果
                 $data = [
-                    'result'=>1,
-                    'matchResult'=>"$result_match->result(球队进球数)"
+                    'result' => 1,
+                    'matchResult' => "$result_match->result(球队进球数)"
                 ];
                 //获取数值
                 $bet = $this->findNum($condition);
                 //以上/以下判断
-                if(strpos($condition,'上') !== false){
-                    if($bet < $result_match->result)
-                    {
+                if (strpos($condition, '上') !== false) {
+                    if ($bet < $result_match->result) {
                         return $data;
                     }
                     $data['result'] = -1;
                     return $data;
                 }
-                if(strpos($condition,'下') !== false){
-                    if($bet > $result_match->result)
-                    {
+                if (strpos($condition, '下') !== false) {
+                    if ($bet > $result_match->result) {
                         return $data;
                     }
                     $data['result'] = -1;
                     return $data;
                 }
                 //大/小判断
-                if(strpos($condition,'大') !== false){
-                    if($bet < $result_match->result)
-                    {
+                if (strpos($condition, '大') !== false) {
+                    if ($bet < $result_match->result) {
                         return $data;
                     }
                     $data['result'] = -1;
                     return $data;
                 }
-                if(strpos($condition,'小') !== false){
-                    if($bet > $result_match->result)
-                    {
+                if (strpos($condition, '小') !== false) {
+                    if ($bet > $result_match->result) {
                         return $data;
                     }
                     $data['result'] = -1;
@@ -960,17 +995,16 @@ class ZqRule
                 }
             }
             //积分成绩判断
-            if(strpos($bet_match->odds_code,'积分') !== false){
+            if (strpos($bet_match->odds_code, '积分') !== false) {
                 //返回结果
                 $data = [
-                    'result'=>1,
-                    'matchResult'=>"$result_match->result(球队积分)"
+                    'result' => 1,
+                    'matchResult' => "$result_match->result(球队积分)"
                 ];
                 $condition = $bet_match->condition;
                 //获取数值
                 $bet = $this->findNum($condition);
-                if($bet == $result_match->result)
-                {
+                if ($bet == $result_match->result) {
                     return $data;
                 }
                 $data['result'] = -1;
@@ -978,16 +1012,15 @@ class ZqRule
             }
 
             //如果条件中没有数字，则获取球队/球员结果
-            if((preg_match('/\d+/',$condition)) == 0){
+            if ((preg_match('/\d+/', $condition)) == 0) {
                 //返回结果
                 $data = [
-                    'result'=>1,
-                    'matchResult'=>"$result_match->result(晋级球队)"
+                    'result' => 1,
+                    'matchResult' => "$result_match->result(晋级球队)"
                 ];
-                $result = $this->teamJudge($condition,$result_match->result);
+                $result = $this->teamJudge($condition, $result_match->result);
 
-                if($result)
-                {
+                if ($result) {
                     return $data;
                 }
                 $data['result'] = -1;
@@ -1002,9 +1035,10 @@ class ZqRule
     /**
      * 冠军盘口 球队/球员结果判断
      */
-    public function teamJudge($condition,$result){
+    public function teamJudge($condition, $result)
+    {
         //返回结果数组中是否包含该球队
-        $result = in_array($condition,json_decode($result,true));
+        $result = in_array($condition, json_decode($result, true));
         return $result;
     }
 
@@ -1013,17 +1047,20 @@ class ZqRule
      * @return string
      * 处理字符串中的数字
      */
-    public function findNum($str=''){
-        $str=trim($str);
-        if(empty($str)){return '';}
-        $result='';
-        for($i=0;$i<strlen($str);$i++){
-            if(is_numeric($str[$i]) || $str[$i] == '.' ){
-                $result.=$str[$i];
+    public function findNum($str = '')
+    {
+        $str = trim($str);
+        if (empty($str)) {
+            return '';
+        }
+        $result = '';
+        for ($i = 0; $i < strlen($str); $i++) {
+            if (is_numeric($str[$i]) || $str[$i] == '.') {
+                $result .= $str[$i];
             }
         }
         //如果有小数点，返回浮点数
-        if(strpos($result,'.')) return floatval($result);
+        if (strpos($result, '.')) return floatval($result);
         //返回整数
         return (int)$result;
     }

app/Lib/Settlement/SettlementOrder.php

@@ -45,6 +45,7 @@ class SettlementOrder extends SettlementBase
     ///$order_ids 某场比塞全部订单数组, $bettype=2 订单类型: 1单式  2串式（默认）,    $settype = 1 结算次数:1首次(默认)  2非首次或重结算
     public function reSettlement($order_ids, $bettype = 2, $settype = 1, $game_code = 0, $match_id = 0)
     {
+
         if (!in_array($bettype, [1, 2])) {
             return self::makeData(6, '订单类型参数错误!');
         }
@@ -65,6 +66,7 @@ class SettlementOrder extends SettlementBase
             }
         }
 
+
         if ($bettype == 1) {
             $chekArr = $this->Match_check($order_ids, $bettype);
             if (empty($chekArr) || count($chekArr) != 1) {
@@ -129,23 +131,25 @@ class SettlementOrder extends SettlementBase
     public function singOrder($order_id)
     {
         // 查询订单下所有的单式注单
-        $simplexData = DB:: table('money_buy_simplex')
-            ->select('batch_id', 'account_identity', 'order_id', 'money', 'game_code', 'info_identity', 'match_id')
-            ->where(['order_id' => $order_id])
-            ->first();
-        // 查询单式注单下的所有玩法
-        $matchData = DB:: table('money_buy_match')->select('odds', 'result', 'batch_id', 'bet_money')->where(['bet_type' => 1, 'batch_id' => $simplexData->batch_id, 'match_id' => $simplexData->match_id]);
-        $matchData = $matchData->where(function ($query) {
-            $query = $query->where(['result' => 1])
-                ->orWhere(['result' => 2])
-                ->orWhere(['result' => 3])
-                ->orWhere(['result' => 4]);
-        });
-        $matchData = $matchData->get()->toArray();
+        $simplexData = $this->BuyDatasMainModel;
+
+        $matchData = DB:: table('money_buy_match')->where(['bet_type' => 1, 'batch_id' => $simplexData->batch_id, 'match_id' => $simplexData->match_id])->get();
+        if (count($matchData) <= 0) {
+            throw new  \Exception("没有数据的错误!");
+        }
+        foreach ($matchData as $val) {
+            if (!in_array($val->result, [-1, 1, 2, 3, 4])) {
+                throw  new  \Exception('match 比赛结果异常或还没有输赢结果->' . $val->id);
+            }
+        }
+
         // 计算总回款
         $settlementBase = new \App\Lib\Settlement\SettlementBase;
         $returnMoney = 0;
         foreach ($matchData as $k => $v) {
+            if ($v->result == -1) {
+                continue;
+            }
             $oddsResult[0]['winOrLose'] = $v->result;
             $oddsResult[0]['odds'] = $v->odds;
             $getReturnMoney = $settlementBase->stringOdds($oddsResult);
@@ -169,6 +173,7 @@ class SettlementOrder extends SettlementBase
             $simplexData->money,
             $this->match_id
         );
+
     }
 
     /**
@@ -198,7 +203,7 @@ class SettlementOrder extends SettlementBase
         $money_time = date('Y-m-d H:i:s', time());
         $trade_desc = $type == 1 ? '单式投注订单回款' : '串式投注订单回款';
         $reason = $type == 1 ? '单式投注订单回款' : '串式投注订单回款';
-        DB:: table('money_details')->insert([
+         DB:: table('money_details')->insert([
             'info_identity' => $info_identity,
             'trade_id' => $order_id,
             'account_name' => $accountInfo->account,
@@ -213,6 +218,7 @@ class SettlementOrder extends SettlementBase
             'sysetem_user' => '系统',
             'status' => '1',
         ]);
+
         // 修改用余额
         DB:: table('account_detailed')
             ->where(['account_identity' => $account_identity])
@@ -232,7 +238,7 @@ class SettlementOrder extends SettlementBase
         ]);
         // 新增中奖记录表
         $old = DB:: table('money_prize')->where(['buy_identity' => $buy_identity])->orWhere(['order_id' => $order_id])->first();
-        if ($old) {
+        if (count($old)) {
             DB:: table('money_prize')->where(['buy_identity' => $buy_identity])->orWhere(['order_id' => $order_id])->update(['money' => $money, 'prize_money' => $returnMoney, 'get_money' => $returnMoney - $money]);
         } else {
             DB:: table('money_prize')->insert([
@@ -256,9 +262,10 @@ class SettlementOrder extends SettlementBase
     //单个串式订单的处理
     public function ChuanOrder($order_id)
     {
+
         $batch_id = $this->BuyDatasMainModel->batch_id;
         $matchModels = DB::table('money_buy_match')->where(['batch_id' => $batch_id, 'bet_type' => 2])->get();
-        if (empty($matchModels)) {
+        if ($matchModels->count() <= 0) {
             throw  new  \Exception('match 数据异常');
         }
 

app/Lib/Settlement/SettlementWinFail.php

@@ -127,7 +127,7 @@ class SettlementWinFail
                     $matchinfo = $winorfalse['matchResult'];
                     $this->makesql_up_buymatch_winorfalse($sval->id, $wininfo, date("Y-m-d H:i:s"), $matchinfo);
                     $gs_val = ($wininfo == 1) ? 1 : ($wininfo == -1 ? 2 : 3);
-                    DB::table('money_buy_simplex')->where(['batch_id'=>$sval->batch_id,'game_code'=>$sval->game_code])->update(['game_status'=>$gs_val]);
+                    DB::table('money_buy_simplex')->where(['batch_id' => $sval->batch_id, 'game_code' => $sval->game_code])->update(['game_status' => $gs_val]);
                 }
             }
         }
@@ -184,23 +184,20 @@ class SettlementWinFail
 
         if ($sval->p_code != 'gj') {
 
-            if (empty($this->resultModel) || empty($this->resultRecords)) {
+            if (count($this->resultModel) <= 0) {
                 throw  new \Exception('非冠军比赛结果数据不能为空');
             }
 
             if ($this->RefClass->hasMethod($fun)) {
-                $winorfalse = $this->AdapterObj->$fun($sval, $this->resultModel, $this->resultRecords);
+                $winorfalse = $this->AdapterObj->$fun($sval, $this->resultModel, []);
             } elseif ($this->RefClass->hasMethod($fun2)) {
-                $winorfalse = $this->AdapterObj->$fun2($sval, $this->resultModel, $this->resultRecords);
+                $winorfalse = $this->AdapterObj->$fun2($sval, $this->resultModel, []);
             } else {
                 throw new \Exception('没有找到玩法输赢判断规则-01', 40010);
             }
         } else {
             $this->getGjDatas($sval);
-            if (empty($this->gjModel)) {
-                throw  new \Exception('冠军比赛结果数据不能为空');
-            }
-
+            
             if ($this->RefClass->hasMethod($fun)) {
                 $winorfalse = $this->AdapterObj->$fun($sval, $this->gjModel, []);
             } elseif ($this->RefClass->hasMethod($fun2)) {
@@ -224,7 +221,7 @@ class SettlementWinFail
 
     private function makesql_up_buymatch_winorfalse($id, $result, $utime, $matchResult = '')
     {
-        $ret = DB::table('money_buy_match')->where(['id'=>$id])->update(['result'=>$result,'utime'=>$utime,'matchResult'=>$matchResult]);
+        $ret = DB::table('money_buy_match')->where(['id' => $id])->update(['result' => $result, 'utime' => $utime, 'matchResult' => $matchResult]);
         return $ret;
     }
 
@@ -312,19 +309,19 @@ class SettlementWinFail
         $model = null;
         switch ($type) {
             case 'bq':
-                $model = DB::table('st_bq_result')->where('match_id', $match_id)->first();
+                $model = DB::table('st_bq_result')->where('match_id', $match_id)->orderby('id', 'asc')->get();
                 $models = DB::table('st_bq_result_record')->where('match_id', $match_id)->orderBy('id', 'asc')->get()->toArray();
                 break;
             case  'lq':
-                $model = DB::table('st_lq_result')->where('match_id', $match_id)->first();
+                $model = DB::table('st_lq_result')->where('match_id', $match_id)->orderby('id', 'asc')->get();
                 $models = DB::table('st_lq_result_record')->where('match_id', $match_id)->orderBy('id', 'asc')->get()->toArray();
                 break;
             case  'wq':
-                $model = DB::table('st_wq_result')->where('match_id', $match_id)->first();
+                $model = DB::table('st_wq_result')->where('match_id', $match_id)->orderby('id', 'asc')->get();
                 $models = DB::table('st_wq_result_record')->where('match_id', $match_id)->orderBy('id', 'asc')->get()->toArray();
                 break;
             case  'zq':
-                $model = DB::table('st_zq_result')->where('match_id', $match_id)->first();
+                $model = DB::table('st_zq_result')->where('match_id', $match_id)->orderby('id', 'asc')->get();
                 $models = DB::table('st_zq_result_record')->where('match_id', $match_id)->orderBy('id', 'asc')->get()->toArray();
                 break;
         }
@@ -344,13 +341,13 @@ class SettlementWinFail
     //冠军比赛结果
     public function getGjDatas($matchModel)
     {
-        if (!empty($this->gjModel)) {
+        if (count($this->gjModel) > 0) {
             return $this->gjModel;
         }
         $table = 'st_' . $matchModel->game_code . '_league_result';
         $where = ['lg_id' => $matchModel->lg_id, 'game_name' => $matchModel->odds_code];
-        $model = DB::table($table)->where($where)->first();
-        if (empty($model)) {
+        $model = DB::table($table)->where($where)->get();
+        if (count($model) <= 0) {
             throw new  \Exception('冠军数据没找到!');
         }
         $this->gjModel = $model;

app/Models/Stbqresultrecord.php

@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 
 class Stbqresultrecord extends Model
 {
-    protected $table = 'st_zq_result_record';
+    protected $table = 'st_bq_result_record';
     public $timestamps = false;
 
 

app/Models/Stlqresultrecord.php

@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 
 class Stlqresultrecord extends Model
 {
-    protected $table = 'st_zq_result_record';
+    protected $table = 'st_lq_result_record';
     public $timestamps = false;
 
 

app/Models/Stwqresultrecord.php

@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 
 class Stwqresultrecord extends Model
 {
-    protected $table = 'st_zq_result_record';
+    protected $table = 'st_wq_result_record';
     public $timestamps = false;
 
 

app/Models/Stzqcompetition.php

@@ -34,7 +34,7 @@ class Stzqcompetition extends Model
 	
 	//足球赛事联赛查询
 	function allcompetition($lg_id){
-		$data = $this->where('lg_id',$lg_id)->select('match_id','home_team')->get();
+		$data = $this->where('lg_id',$lg_id)->select('match_id','home_team','guest_team')->get();
         if (!$data) {
 			return -5040000102; //无相关信息
 		}

app/Models/Stzqresult.php

@@ -6,7 +6,8 @@ class Stzqresult extends BaseModel
 {
 	protected $table = 'st_zq_result';
 	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'];
+              
     function resultlist($list = 10, $page, $where = '',$orwhere = '')
     {
         if (is_array ($where) && count ($where) > 0) {

app/Models/Stzqresultrecord.php

@@ -8,8 +8,8 @@ class Stzqresultrecord extends Model
 {
     protected $table = 'st_zq_result_record';
     public $timestamps = false;
-
-
+    protected $fillable = ['lg_id','home_team','guest_team','home_rate','guest_rate','home_score','status','first_score','last_score','match_score','match_winer','update_time','match_time','match_process','tag','match_id','guest_score','all_goal','source','p_code'];
+    
 }
 
 ?>

resources/lang/zh-cn/sportssoccer.php

@@ -19,6 +19,8 @@ return array(
     'team_search' => '球队查询',
     'team_player_search' => '球员查询',
     'league_search' => '联赛查询',
+    'area_search' => '地区查询',
+    'country_search' => '国家查询',
     'date_search' => '日期查询',
     'match_status_search' => '赛事状态查询',
 

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

@@ -3,7 +3,6 @@
 
 <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">{{ trans('sportsfoot.home_team') }}:</label>
                 <div class="layui-input-block">
@@ -34,6 +33,12 @@
                 <textarea  name="home_score"   id="home_score"    lay-verify="" placeholder="" autocomplete="off" class="layui-input" >@isset($sportsfoot) {{ $sportsfoot['home_score'] }} @endisset </textarea>
                 </div>
             </div>
+            <div class="layui-form-item">
+                <label class="layui-form-label">{{ trans('sportsfoot.guest_score') }}:</label>
+                <div class="layui-input-block">
+                <textarea  name="guest_score"   id="guest_score"    lay-verify="" placeholder="" autocomplete="off" class="layui-input" >@isset($sportsfoot) {{ $sportsfoot['guest_score'] }} @endisset </textarea>
+                </div>
+            </div>
             <div class="layui-form-item">
                 <label class="layui-form-label">{{ trans('sportsfoot.first_score') }}:</label>
                 <div class="layui-input-block">
@@ -141,7 +146,7 @@
                     if (data != undefined && data != null && data != "") {
                         var html = "<option value=''>请选择所属赛事</option>";
                         for (var i = 0; i < data.length; i++) {
-                            html += "<option value=" + data[i]["match_id"] + ">" + data[i]["home_team"] + "</option>";
+                            html += "<option value=" + data[i]["match_id"] + ">" + data[i]["home_team"] +"vs"+ data[i]["guest_team"]+ "</option>";
                         }
                     $("#match_id").append(html);
                             //重新渲染select

resources/views/sports/base_league.blade.php

@@ -50,9 +50,12 @@
                 <div class="layui-form-item">
 
                     <div class="layui-inline">
-                        <label class="layui-form-label">{{ trans('sportssoccer.lg_id') }}</label>
+                        <label class="layui-form-label">{{ trans('sportssoccer.league_search') }}</label>
+                        {{--<div class="layui-input-inline">--}}
+                            {{--<input type="text" name="lg_id" id="lg_id" eventType="event-query"  value="{{ $lg_id }}" lay-verify="required" autocomplete="off" class="layui-input">--}}
+                        {{--</div>--}}
                         <div class="layui-input-inline">
-                            <input type="text" name="lg_id" id="lg_id" eventType="event-query"  value="{{ $lg_id }}" lay-verify="required" autocomplete="off" class="layui-input">
+                            <input type="text" name="name_chinese" id="name_chinese" eventType="event-query"  value="{{ $name_chinese }}" lay-verify="required" autocomplete="off" 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>
@@ -60,21 +63,46 @@
                         </div>
                     </div>
 
-                    <div class="layui-inline">
-                        <label class="layui-form-label">{{ trans('sportssoccer.league_search') }}</label>
-                        <div class="layui-input-inline" style="width: 200px">
-                            <select name="name_chinese"  id="form_name_chinese"  lay-verify="" autocomplete="off" class="layui-input"  eventType=event-query>
-                                <option value="-1"></option>
-                                @foreach($league as $k=>$v):
-                                @if($name_chinese==$v['name_chinese']))
-                                <option value="{{$v['name_chinese']}}" selected="selected">{{$v['name_chinese']}}</option>
-                                @else
-                                    <option value="{{$v['name_chinese']}}">{{$v['name_chinese']}}</option>
-                                @endif
-                                @endforeach
-                            </select>
+                    {{--<div class="layui-inline">--}}
+                        {{--<label class="layui-form-label">{{ trans('sportssoccer.league_search') }}</label>--}}
+                        {{--<div class="layui-input-inline" style="width: 200px">--}}
+                            {{--<select name="name_chinese"  id="form_name_chinese"  lay-verify="" autocomplete="off" class="layui-input"  eventType=event-query>--}}
+                                {{--<option value="-1"></option>--}}
+                                {{--@foreach($league as $k=>$v):--}}
+                                {{--@if($name_chinese==$v['name_chinese']))--}}
+                                {{--<option value="{{$v['name_chinese']}}" selected="selected">{{$v['name_chinese']}}</option>--}}
+                                {{--@else--}}
+                                    {{--<option value="{{$v['name_chinese']}}">{{$v['name_chinese']}}</option>--}}
+                                {{--@endif--}}
+                                {{--@endforeach--}}
+                            {{--</select>--}}
+                        {{--</div>--}}
+                    {{--</div>--}}
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">{{ trans('sportssoccer.area_search') }}</label>
+                            <div class="layui-input-inline" style="width: 200px">
+                                <select name="area_id"  id="form_area_id" lay-filter="sect" autocomplete="off" class="layui-input"  eventType=event-query>
+                                    <option value></option>
+                                    @foreach($area as $k=>$v):
+                                    @if($area_id==$v['id']))
+                                    <option value="{{$v['id']}}" selected="selected">{{$v['name']}}</option>
+                                    @else
+                                        <option value="{{$v['id']}}">{{$v['name']}}</option>
+                                    @endif
+                                    @endforeach
+                                </select>
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">{{ trans('sportssoccer.country_search') }}</label>
+                            <div class="layui-input-inline" style="width: 200px">
+                                <select name="country_id"  id="country_id" lay-filter="sect_country" autocomplete="off" class="layui-input"  eventType=event-query>
+                                    <option value="{{ isset($country_id)?$country_id:'' }}"></option>
+                                </select>
+                            </div>
                         </div>
-                    </div>
 
                     {{--<div class="layui-inline">--}}
                     {{--<label class="layui-form-label">{{ trans('sportssoccer.date_search') }}</label>--}}
@@ -247,7 +275,7 @@
                         for(var i=0;i<data.length;i++){  //循环获取返回值，并组装成html代码
                             option += "<option value="+data[i]["id"]+">"+data[i]["name"]+"</option>";
                         }
-                        $("#country").html(option);
+                        $("#country_id").html(option);
                         //重新渲染select
                         form.render('select');
                     },

resources/views/sports/basket_league.blade.php

@@ -50,9 +50,12 @@
                 <div class="layui-form-item">
 
                     <div class="layui-inline">
-                        <label class="layui-form-label">{{ trans('sportssoccer.lg_id') }}</label>
+                        <label class="layui-form-label">{{ trans('sportssoccer.league_search') }}</label>
+                        {{--<div class="layui-input-inline">--}}
+                            {{--<input type="text" name="lg_id" id="lg_id" eventType="event-query"  value="{{ $lg_id }}" lay-verify="required" autocomplete="off" class="layui-input">--}}
+                        {{--</div>--}}
                         <div class="layui-input-inline">
-                            <input type="text" name="lg_id" id="lg_id" eventType="event-query"  value="{{ $lg_id }}" lay-verify="required" autocomplete="off" class="layui-input">
+                            <input type="text" name="name_chinese" id="name_chinese" eventType="event-query"  value="{{ $name_chinese }}" lay-verify="required" autocomplete="off" 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>
@@ -60,22 +63,47 @@
                         </div>
                     </div>
 
+                    {{--<div class="layui-inline">--}}
+                        {{--<label class="layui-form-label">{{ trans('sportssoccer.league_search') }}</label>--}}
+                        {{--<div class="layui-input-inline" style="width: 200px">--}}
+                            {{--<select name="name_chinese"  id="form_name_chinese"  lay-verify="" autocomplete="off" class="layui-input"  eventType=event-query>--}}
+                                {{--<option value="-1"></option>--}}
+                                {{--@foreach($league as $k=>$v):--}}
+                                {{--@if($name_chinese==$v['name_chinese']))--}}
+                                {{--<option value="{{$v['name_chinese']}}" selected="selected">{{$v['name_chinese']}}</option>--}}
+                                {{--@else--}}
+                                    {{--<option value="{{$v['name_chinese']}}">{{$v['name_chinese']}}</option>--}}
+                                {{--@endif--}}
+                                {{--@endforeach--}}
+                            {{--</select>--}}
+                        {{--</div>--}}
+                    {{--</div>--}}
+
                     <div class="layui-inline">
-                        <label class="layui-form-label">{{ trans('sportssoccer.league_search') }}</label>
+                        <label class="layui-form-label">{{ trans('sportssoccer.area_search') }}</label>
                         <div class="layui-input-inline" style="width: 200px">
-                            <select name="name_chinese"  id="form_name_chinese"  lay-verify="" autocomplete="off" class="layui-input"  eventType=event-query>
-                                <option value="-1"></option>
-                                @foreach($league as $k=>$v):
-                                @if($name_chinese==$v['name_chinese']))
-                                <option value="{{$v['name_chinese']}}" selected="selected">{{$v['name_chinese']}}</option>
+                            <select name="area_id"  id="form_area_id" lay-filter="sect" autocomplete="off" class="layui-input"  eventType=event-query>
+                                <option value></option>
+                                @foreach($area as $k=>$v):
+                                @if($area_id==$v['id']))
+                                <option value="{{$v['id']}}" selected="selected">{{$v['name']}}</option>
                                 @else
-                                    <option value="{{$v['name_chinese']}}">{{$v['name_chinese']}}</option>
+                                    <option value="{{$v['id']}}">{{$v['name']}}</option>
                                 @endif
                                 @endforeach
                             </select>
                         </div>
                     </div>
 
+                    <div class="layui-inline">
+                        <label class="layui-form-label">{{ trans('sportssoccer.country_search') }}</label>
+                        <div class="layui-input-inline" style="width: 200px">
+                            <select name="country_id"  id="country_id" lay-filter="sect_country" autocomplete="off" class="layui-input"  eventType=event-query>
+                                <option value="{{ isset($country_id)?$country_id:'' }}"></option>
+                            </select>
+                        </div>
+                    </div>
+
                     {{--<div class="layui-inline">--}}
                         {{--<label class="layui-form-label">{{ trans('sportssoccer.date_search') }}</label>--}}
                         {{--<div class="layui-input-inline">--}}
@@ -232,20 +260,20 @@
             var form = layui.form;
             form.on('select(sect)',function(data){
                 id = data.value;
-                console.log(id);
+                //console.log(id);
                 $.ajax({
                     type:'get',
                     url:'/admin/BasketLeague/getcountry',
                     data:{id:id},
                     dataType:'json',
                     success:function(data){  //请求成功回调函数
-                        console.log(data);
+                        //console.log(data);
                         var option = '';
                         option += '<option value></option>';
                         for(var i=0;i<data.length;i++){  //循环获取返回值，并组装成html代码
                             option += "<option value="+data[i]["id"]+">"+data[i]["name"]+"</option>";
                         }
-                        $("#country").html(option);
+                        $("#country_id").html(option);
                         //重新渲染select
                         form.render('select');
                     },

resources/views/sports/soccer_league.blade.php

@@ -50,9 +50,12 @@
                 <div class="layui-form-item">
 
                     <div class="layui-inline">
-                        <label class="layui-form-label">{{ trans('sportssoccer.lg_id') }}</label>
+                        <label class="layui-form-label">{{ trans('sportssoccer.league_search') }}</label>
+                        {{--<div class="layui-input-inline">--}}
+                            {{--<input type="text" name="lg_id" id="lg_id" eventType="event-query"  value="{{ $lg_id }}" lay-verify="required" autocomplete="off" class="layui-input">--}}
+                        {{--</div>--}}
                         <div class="layui-input-inline">
-                            <input type="text" name="lg_id" id="lg_id" eventType="event-query"  value="{{ $lg_id }}" lay-verify="required" autocomplete="off" class="layui-input">
+                            <input type="text" name="name_chinese" id="name_chinese" eventType="event-query"  value="{{ $name_chinese }}" lay-verify="required" autocomplete="off" 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>
@@ -60,22 +63,47 @@
                         </div>
                     </div>
 
+                    {{--<div class="layui-inline">--}}
+                        {{--<label class="layui-form-label">{{ trans('sportssoccer.league_search') }}</label>--}}
+                        {{--<div class="layui-input-inline" style="width: 150px">--}}
+                            {{--<select name="name_chinese"  id="form_name_chinese"  lay-verify="" autocomplete="off" class="layui-input"  eventType=event-query>--}}
+                                {{--<option value="-1"></option>--}}
+                                {{--@foreach($league as $k=>$v):--}}
+                                {{--@if($name_chinese==$v['name_chinese']))--}}
+                                {{--<option value="{{$v['name_chinese']}}" selected="selected">{{$v['name_chinese']}}</option>--}}
+                                {{--@else--}}
+                                    {{--<option value="{{$v['name_chinese']}}">{{$v['name_chinese']}}</option>--}}
+                                {{--@endif--}}
+                                {{--@endforeach--}}
+                            {{--</select>--}}
+                        {{--</div>--}}
+                    {{--</div>--}}
+
                     <div class="layui-inline">
-                        <label class="layui-form-label">{{ trans('sportssoccer.league_search') }}</label>
+                        <label class="layui-form-label">{{ trans('sportssoccer.area_search') }}</label>
                         <div class="layui-input-inline" style="width: 200px">
-                            <select name="name_chinese"  id="form_name_chinese"  lay-verify="" autocomplete="off" class="layui-input"  eventType=event-query>
-                                <option value="-1"></option>
-                                @foreach($league as $k=>$v):
-                                @if($name_chinese==$v['name_chinese']))
-                                <option value="{{$v['name_chinese']}}" selected="selected">{{$v['name_chinese']}}</option>
+                            <select name="area_id"  id="form_area_id" lay-filter="sect" autocomplete="off" class="layui-input"  eventType=event-query>
+                                <option value></option>
+                                @foreach($area as $k=>$v):
+                                @if($area_id==$v['id']))
+                                <option value="{{$v['id']}}" selected="selected">{{$v['name']}}</option>
                                 @else
-                                    <option value="{{$v['name_chinese']}}">{{$v['name_chinese']}}</option>
+                                    <option value="{{$v['id']}}">{{$v['name']}}</option>
                                 @endif
                                 @endforeach
                             </select>
                         </div>
                     </div>
 
+                    <div class="layui-inline">
+                        <label class="layui-form-label">{{ trans('sportssoccer.country_search') }}</label>
+                        <div class="layui-input-inline" style="width: 200px">
+                            <select name="country_id"  id="country_id" lay-filter="sect_country" autocomplete="off" class="layui-input"  eventType=event-query>
+                                <option value="{{ isset($country_id)?$country_id:'' }}"></option>
+                            </select>
+                        </div>
+                    </div>
+
                     {{--<div class="layui-inline">--}}
                         {{--<label class="layui-form-label">{{ trans('sportssoccer.date_search') }}</label>--}}
                         {{--<div class="layui-input-inline">--}}
@@ -232,14 +260,14 @@
             var form = layui.form;
             form.on('select(sect)',function(data){
                 id = data.value;
-                console.log(id);
+                //console.log(id);
                 $.ajax({
                     type:'get',
                     url:'/admin/SoccerLeague/getcountry',
                     data:{id:id},
                     dataType:'json',
                     success:function(data){  //请求成功回调函数
-                        console.log(data);
+                        //console.log(data);
                         var option = '';
                         var dd = '';
                         option += '<option value></option>';
@@ -247,7 +275,7 @@
                         for(var i=0;i<data.length;i++){  //循环获取返回值，并组装成html代码
                             option += "<option value="+data[i]["id"]+">"+data[i]["name"]+"</option>";
                         }
-                        $("#country").html(option);
+                        $("#country_id").html(option);
                         //重新渲染select
                         form.render('select');
                     },

resources/views/sports/tennis_league.blade.php

@@ -50,9 +50,12 @@
                 <div class="layui-form-item">
 
                     <div class="layui-inline">
-                        <label class="layui-form-label">{{ trans('sportssoccer.lg_id') }}</label>
+                        <label class="layui-form-label">{{ trans('sportssoccer.league_search') }}</label>
+                        {{--<div class="layui-input-inline">--}}
+                            {{--<input type="text" name="lg_id" id="lg_id" eventType="event-query"  value="{{ $lg_id }}" lay-verify="required" autocomplete="off" class="layui-input">--}}
+                        {{--</div>--}}
                         <div class="layui-input-inline">
-                            <input type="text" name="lg_id" id="lg_id" eventType="event-query"  value="{{ $lg_id }}" lay-verify="required" autocomplete="off" class="layui-input">
+                            <input type="text" name="name_chinese" id="name_chinese" eventType="event-query"  value="{{ $name_chinese }}" lay-verify="required" autocomplete="off" 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>
@@ -60,22 +63,47 @@
                         </div>
                     </div>
 
+                    {{--<div class="layui-inline">--}}
+                        {{--<label class="layui-form-label">{{ trans('sportssoccer.league_search') }}</label>--}}
+                        {{--<div class="layui-input-inline" style="width: 200px">--}}
+                            {{--<select name="name_chinese"  id="form_name_chinese"  lay-verify="" autocomplete="off" class="layui-input"  eventType=event-query>--}}
+                                {{--<option value="-1"></option>--}}
+                                {{--@foreach($league as $k=>$v):--}}
+                                {{--@if($name_chinese==$v['name_chinese']))--}}
+                                {{--<option value="{{$v['name_chinese']}}" selected="selected">{{$v['name_chinese']}}</option>--}}
+                                {{--@else--}}
+                                    {{--<option value="{{$v['name_chinese']}}">{{$v['name_chinese']}}</option>--}}
+                                {{--@endif--}}
+                                {{--@endforeach--}}
+                            {{--</select>--}}
+                        {{--</div>--}}
+                    {{--</div>--}}
+
                     <div class="layui-inline">
-                        <label class="layui-form-label">{{ trans('sportssoccer.league_search') }}</label>
+                        <label class="layui-form-label">{{ trans('sportssoccer.area_search') }}</label>
                         <div class="layui-input-inline" style="width: 200px">
-                            <select name="name_chinese"  id="form_name_chinese"  lay-verify="" autocomplete="off" class="layui-input"  eventType=event-query>
-                                <option value="-1"></option>
-                                @foreach($league as $k=>$v):
-                                @if($name_chinese==$v['name_chinese']))
-                                <option value="{{$v['name_chinese']}}" selected="selected">{{$v['name_chinese']}}</option>
+                            <select name="area_id"  id="form_area_id" lay-filter="sect" autocomplete="off" class="layui-input"  eventType=event-query>
+                                <option value></option>
+                                @foreach($area as $k=>$v):
+                                @if($area_id==$v['id']))
+                                <option value="{{$v['id']}}" selected="selected">{{$v['name']}}</option>
                                 @else
-                                    <option value="{{$v['name_chinese']}}">{{$v['name_chinese']}}</option>
+                                    <option value="{{$v['id']}}">{{$v['name']}}</option>
                                 @endif
                                 @endforeach
                             </select>
                         </div>
                     </div>
 
+                    <div class="layui-inline">
+                        <label class="layui-form-label">{{ trans('sportssoccer.country_search') }}</label>
+                        <div class="layui-input-inline" style="width: 200px">
+                            <select name="country_id"  id="country_id" lay-filter="sect_country" autocomplete="off" class="layui-input"  eventType=event-query>
+                                <option value="{{ isset($country_id)?$country_id:'' }}"></option>
+                            </select>
+                        </div>
+                    </div>
+
                     {{--<div class="layui-inline">--}}
                     {{--<label class="layui-form-label">{{ trans('sportssoccer.date_search') }}</label>--}}
                     {{--<div class="layui-input-inline">--}}
@@ -247,7 +275,7 @@
                         for(var i=0;i<data.length;i++){  //循环获取返回值，并组装成html代码
                             option += "<option value="+data[i]["id"]+">"+data[i]["name"]+"</option>";
                         }
-                        $("#country").html(option);
+                        $("#country_id").html(option);
                         //重新渲染select
                         form.render('select');
                     },

测试钩子.txt

@@ -1 +1 @@
-123
+12344