异常处理

app/Http/Controllers/Admin/SportsbkController.php

@@ -18,7 +18,6 @@ class SportsbkController extends Controller {
 	public function outcome(Req $req) {
 		$request['home_team'] = isset($req->home_team) ? trim($req->home_team) : null;
 		$request['status'] = isset($req->status) ? trim($req->status) : '-1';
-		$request['source'] = isset($req->source) ? $req->source : null;
 		$request['sureblurs'] = isset($req->sureblurs) ? $req->sureblurs : 'on';
 		$request['star_time'] = isset($req->star_time) ? trim($req->star_time) :trans('status.default_time.seven_day') ;
         $request['end_time'] = isset($req->end_time) ? trim($req->end_time) : trans('status.default_time.etime');
@@ -143,7 +142,6 @@ class SportsbkController extends Controller {
 		$star_time = Request::get('star_time') ? Request::get('star_time').' 00:00:00' : '';
         $end_time = Request::get('end_time') ? Request::get('end_time').' 23:59:59' : '';
 		$status = Request::has('status') ? Request::get('status') : '';
-		$source = Request::has('source') ? Request::get('source') : '';
 		$where = array();
 		$orwhere = array();
 		if (!empty($home_team)) {
@@ -158,9 +156,6 @@ class SportsbkController extends Controller {
 		if ($status != -1) {
 			$where[] = array('st_lq_result.status', '=', $status);
 		}
-		if (!empty($source)) {
-			$where[] = array('st_lq_result.source', '=', $source);
-		}//var_dump($where);die;
 		if (!empty($star_time)) {
             $star_time = date('Y-m-d H:i:s', strtotime($star_time));
             $where[] = array('st_lq_result.start_time', '>', $star_time);

app/Http/Controllers/Admin/SportsbqController.php

@@ -17,7 +17,6 @@ class SportsbqController extends Controller {
 	function outcome(Req $req) {
 		$request=array();
 		$request['status'] = isset($req->status) ? trim($req->status) : '-1';
-		$request['source'] = isset($req->source) ? $req->source : null;
 		$request['sureblurs'] = isset($req->sureblurs) ? $req->sureblurs : 'on';
 		$request['home_team'] = isset($req->home_team) ? trim($req->home_team) : null;
 		$request['star_time'] = isset($req->star_time) ? trim($req->star_time) :trans('status.default_time.seven_day') ;
@@ -42,7 +41,6 @@ class SportsbqController extends Controller {
 		$home_team = Request::has('home_team') ? Request::get('home_team') : '';
 		$sureblur = Request::has('sureblurs') ? Request::get('sureblurs') : 'off';
 		$status = Request::has('status') ? Request::get('status') : '';
-		$source = Request::has('source') ? Request::get('source') : 'hg3535';
 		$star_time = Request::get('star_time') ? Request::get('star_time').' 00:00:00' : '';
         $end_time = Request::get('end_time') ? Request::get('end_time').' 23:59:59' : '';
 
@@ -50,9 +48,6 @@ class SportsbqController extends Controller {
         if ($status != -1) {
 			$where[] = array('st_bq_result.status', '=', $status);
 		}
-		if (!empty($source)) {
-			$where[] = array('st_bq_result.source', '=', $source);
-		}
 		if (!empty($star_time)) {
 	            $star_time = date('Y-m-d H:i:s', strtotime($star_time));
 	            $where[] = array('st_bq_result.start_time', '>', $star_time);

app/Http/Controllers/Admin/SportswqController.php

@@ -21,7 +21,6 @@ class SportswqController extends Controller {
 		$request['home_team'] = isset($req->home_team) ? trim($req->home_team) : null;
 		$request['status'] = isset($req->status) ? trim($req->status) : '-1';
 		$request['sureblurs'] = isset($req->sureblurs) ? $req->sureblurs : 'on';
-		$request['source'] = isset($req->source) ? $req->source : null;
 		$request['name_chinese'] = isset($req->name_chinese) ? $req->name_chinese : null;
 		$request['star_time'] = isset($req->star_time) ? trim($req->star_time) :trans('status.default_time.seven_day') ;
         $request['end_time'] = isset($req->end_time) ? trim($req->end_time) : trans('status.default_time.etime');
@@ -49,7 +48,6 @@ class SportswqController extends Controller {
 		$home_team = Request::has('home_team') ? Request::get('home_team') : '';
 		$sureblur = Request::has('sureblurs') ? Request::get('sureblurs') : 'off';
 		$status = Request::has('status') ? Request::get('status') : '';
-		$source = Request::has('source') ? Request::get('source') : 'hg3535';
         $star_time = Request::get('star_time') ? Request::get('star_time').' 00:00:00' : '';
         $end_time = Request::get('end_time') ? Request::get('end_time').' 23:59:59' : '';
         $name_chinese = Request::has('name_chinese') ? Request::get('name_chinese') : '';
@@ -68,9 +66,6 @@ class SportswqController extends Controller {
 		if ($status != -1) {
 			$where[] = array('st_wq_result.status', '=', $status);
 		}
-		if (!empty($source)) {
-			$where[] = array('st_wq_result.source', '=', $source);
-		}
 		if (!empty($name_chinese)) {
 			$where[] = array('st_wq_result.name_chinese', '=', $name_chinese);
 		}

app/Http/Controllers/Api/WriteSportsController.php

@@ -266,7 +266,18 @@ class WriteSportsController extends BaseController{
             }
             sort($identity);
             //去除本地和请求里都存在的联赛，如果还有剩余联赛id,则返回异常
-            if(!empty($identity))  throw new \Exception(Response::generate($gameName.'联赛：uuid-'.$identity[0].';',Response::LEAGUE_ERROR));
+            // if(!empty($identity))  throw new \Exception(Response::generate($gameName.'联赛：uuid-'.$identity[0].';',Response::LEAGUE_ERROR));
+            //如果有剩余联赛，则表示该赛事找不到联赛，将其删除
+            if(!empty($identity)){
+                foreach($matchData as $k=>$v){
+                    foreach($identity as $kk=> $uuid){
+                        if($v['uuid'] == $uuid){
+                            unset($matchData[$k]);
+                        }
+                    }
+                }
+                sort($matchData);
+            }
             //====end====
 
             //====获取 本地 已存在 赛事====

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

@@ -192,21 +192,6 @@
                             </select>
                         </div>
                    </div>
-                   <!-- <div class="layui-inline">
-                        <label class="layui-form-label">{{ trans('sportsbk.sjsource') }}</label>
-                        <div class="layui-input-inline" style="width: 200px">
-                            <select name="source"  id="form_source"  lay-verify="" autocomplete="off" class="layui-input" eventType=event-query>
-                                <option value="">请选择{{ trans('sportsbk.sjsource') }}</option>
-                                @foreach(trans('status.sjsource.source') as $k=>$v):
-                                    @if($source==$k)
-                                        <option value={{$v}} selected>{{$v}}</option>
-                                    @else
-                                        <option value={{$v}}>{{$v}}</option>
-                                    @endif
-                                @endforeach
-                            </select>
-                        </div>
-                    </div> -->
                     <div class="layui-inline">
                         <label class="layui-form-label">{{ trans('sportsfoot.star_time') }}</label>
                         <div class="layui-input-inline">

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

@@ -190,21 +190,6 @@
                             </select>
                         </div>
                    </div>
-                   <!-- <div class="layui-inline">
-                        <label class="layui-form-label">{{ trans('sportsbk.sjsource') }}</label>
-                        <div class="layui-input-inline" style="width: 200px">
-                            <select name="source"  id="form_source"  lay-verify="" autocomplete="off" class="layui-input" eventType=event-query>
-                                <option value="">请选择{{ trans('sportsbk.sjsource') }}</option>
-                                @foreach(trans('status.sjsource.source') as $k=>$v):
-                                    @if($source==$k)
-                                        <option value={{$v}} selected>{{$v}}</option>
-                                    @else
-                                        <option value={{$v}}>{{$v}}</option>
-                                    @endif
-                                @endforeach
-                            </select>
-                        </div>
-                    </div> -->
                     <div class="layui-inline">
                         <label class="layui-form-label">{{ trans('sportsfoot.star_time') }}</label>
                         <div class="layui-input-inline">

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

@@ -215,21 +215,6 @@
                             </select>
                         </div>
                    </div>
-                   <!-- <div class="layui-inline">
-                        <label class="layui-form-label">{{ trans('sportsbk.sjsource') }}</label>
-                        <div class="layui-input-inline" style="width: 200px">
-                            <select name="source"  id="form_source"  lay-verify="" autocomplete="off" class="layui-input" eventType=event-query>
-                                <option value="">请选择{{ trans('sportsbk.sjsource') }}</option>
-                                @foreach(trans('status.sjsource.source') as $k=>$v):
-                                    @if($source==$k)
-                                        <option value={{$v}} selected>{{$v}}</option>
-                                    @else
-                                        <option value={{$v}}>{{$v}}</option>
-                                    @endif
-                                @endforeach
-                            </select>
-                        </div>
-                    </div> -->
                     <div class="layui-inline">
                         <label class="layui-form-label">{{ trans('sportsfoot.star_time') }}1</label>
                         <div class="layui-input-inline">