Browse Source

异常处理

彭俊 6 years ago
parent
commit
62f39e36c1

+ 3 - 0
app/Http/Controllers/Admin/SportsBaseController.php

@@ -449,6 +449,9 @@ class SportsBaseController extends Controller {
             $where[] = array('st_bq_odds.p_code', '=', $p_code);
         }
         if (!empty($status) && $status != -1) {
+            if($status == 2){
+                $status = -1;
+            } 
             $where[] = array('st_bq_odds.status', '=', $status);
         }
 

+ 3 - 0
app/Http/Controllers/Admin/SportsBasketController.php

@@ -445,6 +445,9 @@ class SportsBasketController extends Controller {
 			$where[] = array('st_lq_odds.p_code', '=', $p_code);
 		}
 		if (!empty($status) && $status != -1) {
+			if($status == 2){
+                $status = -1;
+            } 
 			$where[] = array('st_lq_odds.status', '=', $status);
 		}
 

+ 8 - 2
app/Http/Controllers/Admin/SportsSoccerController.php

@@ -454,17 +454,23 @@ class SportsSoccerController extends Controller
         return view('sports/soccer_odds', $dt->render($request));
     }
 
+    /**
+     * 1
+     */
     function oddsinfo(Req $req)
     {
         $lange = trans('sportsoddscode');
         $match_id = $req->match_id;
         $p_code = Request::has('p_code') ? Request::get('p_code') : '';
-        $status = Request::has('status') ? Request::get('status') : '';
+        $status = Request::has('status') ? Request::get('status') : '';//状态 默认0启用 1停用 -1禁用
         $where = array();
         if (!empty($p_code) && $p_code != -1) {
             $where[] = array('st_zq_odds.p_code', '=', $p_code);
         }
-        if (!empty($status) && $status != -1) {
+        if (!empty($status) && $status != '-1') {
+            if($status == 2){
+                $status = -1;
+            } 
             $where[] = array('st_zq_odds.status', '=', $status);
         }
 

+ 3 - 0
app/Http/Controllers/Admin/SportsTennisController.php

@@ -446,6 +446,9 @@ class SportsTennisController extends Controller {
             $where[] = array('st_wq_odds.p_code', '=', $p_code);
         }
         if (!empty($status) && $status != -1) {
+            if($status == 2){
+                $status = -1;
+            } 
             $where[] = array('st_wq_odds.status', '=', $status);
         }
 

+ 13 - 12
app/Http/Controllers/Admin/SportsbkController.php

@@ -214,24 +214,25 @@ class SportsbkController extends Controller {
 			} else {
 				if(is_numeric($home_team)){
 					$where[] = array('st_lq_result.match_id', '=', $home_team);
+                    $orwhere[] = array('st_lq_result.match_id', '=', $home_team);
 				}else{
 					$where[] = array('st_lq_result.home_team', '=', $home_team);
 					$orwhere[] = array('st_lq_result.guest_team', '=', $home_team);
 				}
 			}
 		}
-		if(!is_numeric($home_team)){
-			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);
-	            $orwhere[] = array('st_lq_result.start_time', '>', $star_time);
-	        }
-	        if (!empty($end_time)) {
-	            $end_time = date('Y-m-d H:i:s', strtotime($end_time));
-	            $where[] = array('st_lq_result.start_time', '<', $end_time);
-	            $orwhere[] = array('st_lq_result.start_time', '<', $end_time);
-	        }
-	    }
+
+        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);
+            $orwhere[] = array('st_lq_result.start_time', '>', $star_time);
+        }
+        if (!empty($end_time)) {
+            $end_time = date('Y-m-d H:i:s', strtotime($end_time));
+            $where[] = array('st_lq_result.start_time', '<', $end_time);
+            $orwhere[] = array('st_lq_result.start_time', '<', $end_time);
+        }
+
 		if ($status != -1) {
 			$where[] = array('st_lq_result.status', '=', $status);
 			$orwhere[] = array('st_lq_result.status', '=', $status);

+ 12 - 12
app/Http/Controllers/Admin/SportsbqController.php

@@ -64,18 +64,18 @@ class SportsbqController extends Controller {
 			$where[] = array('st_bq_result.status', '=', $status);
 			$orwhere[] = array('st_bq_result.status', '=', $status);
 		}
-		if(!is_numeric($home_team)){
-			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);
-	            $orwhere[] = array('st_bq_result.start_time', '>', $star_time);
-	        }
-	        if (!empty($end_time)) {
-	            $end_time = date('Y-m-d H:i:s', strtotime($end_time));
-	            $where[] = array('st_bq_result.start_time', '<', $end_time);
-	            $orwhere[] = array('st_bq_result.start_time', '<', $end_time);
-	        }
-	    }
+
+        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);
+            $orwhere[] = array('st_bq_result.start_time', '>', $star_time);
+        }
+        if (!empty($end_time)) {
+            $end_time = date('Y-m-d H:i:s', strtotime($end_time));
+            $where[] = array('st_bq_result.start_time', '<', $end_time);
+            $orwhere[] = array('st_bq_result.start_time', '<', $end_time);
+        }
+
 		
 		$newapp = new \App\Models\Stbqresult();
         $data = $newapp->getinfo($list, $page, $where,$orwhere);

+ 13 - 12
app/Http/Controllers/Admin/SportsfootController.php

@@ -704,6 +704,7 @@ class SportsfootController extends Controller {
 			} else {
 				if(is_numeric($home_team)){
 					$where[] = array('st_zq_result.match_id', '=', $home_team);
+                    $orwhere[] = array('st_zq_result.match_id', '=', $home_team);
 				}else{
 					$where[] = array('st_zq_result.home_team', '=', $home_team);
 					$orwhere[] = array('st_zq_result.guest_team', '=', $home_team);
@@ -714,18 +715,18 @@ class SportsfootController extends Controller {
 			$where[] = array('st_zq_result.status', '=', $status);
 			$orwhere[] = array('st_zq_result.status', '=', $status);
 		}
-		if(!is_numeric($home_team)){
-			if (!empty($star_time)) {
-	            $star_time = date('Y-m-d H:i:s', strtotime($star_time));
-	            $where[] = array('st_zq_result.start_time', '>', $star_time);
-	            $orwhere[] = array('st_zq_result.start_time', '>', $star_time);
-	        }
-	        if (!empty($end_time)) {
-	            $end_time = date('Y-m-d H:i:s', strtotime($end_time));
-	            $where[] = array('st_zq_result.start_time', '<', $end_time);
-	            $orwhere[] = array('st_zq_result.start_time', '<', $end_time);
-	        }
-	    }
+
+        if (!empty($star_time)) {
+            $star_time = date('Y-m-d H:i:s', strtotime($star_time));
+            $where[] = array('st_zq_result.start_time', '>', $star_time);
+            $orwhere[] = array('st_zq_result.start_time', '>', $star_time);
+        }
+        if (!empty($end_time)) {
+            $end_time = date('Y-m-d H:i:s', strtotime($end_time));
+            $where[] = array('st_zq_result.start_time', '<', $end_time);
+            $orwhere[] = array('st_zq_result.start_time', '<', $end_time);
+        }
+
         $newapp = new \App\Models\Stzqresult();
         $data = $newapp->resultlist($list, $page, $where, $orwhere);
         

+ 13 - 12
app/Http/Controllers/Admin/SportswqController.php

@@ -62,24 +62,25 @@ class SportswqController extends Controller {
 			} else {
 				if(is_numeric($home_team)){
 					$where[] = array('st_wq_result.match_id', '=', $home_team);
+                    $orwhere[] = array('st_wq_result.match_id', '=', $home_team);
 				}else{
 					$where[] = array('st_wq_result.home_player_name', '=', $home_team);
 					$orwhere[] = array('st_wq_result.guest_player_name', '=', $home_team);
 				}
 			}
 		}
-		if(!is_numeric($home_team)){
-			if (!empty($star_time)) {
-	            $star_time = date('Y-m-d H:i:s', strtotime($star_time));
-	            $where[] = array('st_wq_result.start_time', '>', $star_time);
-	            $orwhere[] = array('st_wq_result.start_time', '>', $star_time);
-	        }
-	        if (!empty($end_time)) {
-	            $end_time = date('Y-m-d H:i:s', strtotime($end_time));
-	            $where[] = array('st_wq_result.start_time', '<', $end_time);
-	            $orwhere[] = array('st_wq_result.start_time', '<', $end_time);
-	        }
-	    }
+
+        if (!empty($star_time)) {
+            $star_time = date('Y-m-d H:i:s', strtotime($star_time));
+            $where[] = array('st_wq_result.start_time', '>', $star_time);
+            $orwhere[] = array('st_wq_result.start_time', '>', $star_time);
+        }
+        if (!empty($end_time)) {
+            $end_time = date('Y-m-d H:i:s', strtotime($end_time));
+            $where[] = array('st_wq_result.start_time', '<', $end_time);
+            $orwhere[] = array('st_wq_result.start_time', '<', $end_time);
+        }
+
 		if ($status != -1) {
 			$where[] = array('st_wq_result.status', '=', $status);
 			$orwhere[] = array('st_wq_result.status', '=', $status);

+ 2 - 2
app/Models/BaseOdds.php

@@ -25,8 +25,8 @@ class BaseOdds extends BaseModel
         }
 
         //玩法代码
-        $pcode = \App\Models\Matchcode::where('p_id','0')->get();
-        $odds_code = \App\Models\Matchcode::where('p_id','!=','0')->get();
+        $pcode = \App\Models\Matchcode::where(['p_id'=>'0','game_code'=>'bq'])->get();
+        $odds_code = \App\Models\Matchcode::where([['p_id','!=','0'],['game_code','=','bq']])->get();
 
         for($i=0;$i<count($data);$i++){
             if($data[$i]['status']==0){

+ 2 - 2
app/Models/BasketOdds.php

@@ -25,8 +25,8 @@ class BasketOdds extends BaseModel
         }
 
         //玩法代码
-        $pcode = \App\Models\Matchcode::where('p_id','0')->get();
-        $odds_code = \App\Models\Matchcode::where('p_id','!=','0')->get();
+        $pcode = \App\Models\Matchcode::where(['p_id'=>'0','game_code'=>'lq'])->get();
+        $odds_code = \App\Models\Matchcode::where([['p_id','!=','0'],['game_code','=','lq']])->get();
 
         for($i=0;$i<count($data);$i++){
             if($data[$i]['status']==0){

+ 2 - 2
app/Models/SoccerOdds.php

@@ -25,8 +25,8 @@ class SoccerOdds extends BaseModel
         }
 
         //玩法代码
-        $pcode = \App\Models\Matchcode::where('p_id','0')->get();
-        $odds_code = \App\Models\Matchcode::where('p_id','!=','0')->get();
+        $pcode = \App\Models\Matchcode::where(['p_id'=>'0','game_code'=>'zq'])->get();
+        $odds_code = \App\Models\Matchcode::where([['p_id','!=','0'],['game_code','=','zq']])->get();
 
         for($i=0;$i<count($data);$i++){
             if($data[$i]['status']==0){

+ 14 - 0
app/Models/Stbqresultlog.php

@@ -0,0 +1,14 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * Date: 2019/10/14
+ * Time: 13:59
+ */
+namespace App\Models;
+use Illuminate\Support\Facades\DB;
+class Stbqresultlog extends BaseModel {
+    protected $table = "st_bq_result_log";
+    public $timestamps = false;
+
+
+}

+ 14 - 0
app/Models/Stlqresultlog.php

@@ -0,0 +1,14 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * Date: 2019/10/14
+ * Time: 13:59
+ */
+namespace App\Models;
+use Illuminate\Support\Facades\DB;
+class Stlqresultlog extends BaseModel {
+    protected $table = "st_lq_result_log";
+    public $timestamps = false;
+
+
+}

+ 14 - 0
app/Models/Stwqresultlog.php

@@ -0,0 +1,14 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * Date: 2019/10/14
+ * Time: 13:59
+ */
+namespace App\Models;
+use Illuminate\Support\Facades\DB;
+class Stwqresultlog extends BaseModel {
+    protected $table = "st_wq_result_log";
+    public $timestamps = false;
+
+
+}

+ 14 - 0
app/Models/Stzqresultlog.php

@@ -0,0 +1,14 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * Date: 2019/10/14
+ * Time: 13:59
+ */
+namespace App\Models;
+use Illuminate\Support\Facades\DB;
+class Stzqresultlog extends BaseModel {
+    protected $table = "st_zq_result_log";
+    public $timestamps = false;
+
+
+}

+ 2 - 2
app/Models/TennisOdds.php

@@ -25,8 +25,8 @@ class TennisOdds extends BaseModel
         }
 
         //玩法代码
-        $pcode = \App\Models\Matchcode::where('p_id','0')->get();
-        $odds_code = \App\Models\Matchcode::where('p_id','!=','0')->get();
+        $pcode = \App\Models\Matchcode::where(['p_id'=>'0','game_code'=>'wq'])->get();
+        $odds_code = \App\Models\Matchcode::where([['p_id','!=','0'],['game_code','=','wq']])->get();
 
         for($i=0;$i<count($data);$i++){
             if($data[$i]['status']==0){

+ 10 - 4
resources/views/sports/base_form.blade.php

@@ -2,12 +2,15 @@
 @section('content')
     <form class="layui-form" action="{{ url()->full() }}" id="submitForm" name="submitForm" method="post" eventType=eventAjaxForm>
         {!! csrf_field() !!}
+        <!--
         <div class="layui-form-item" style="display: none;">
             <label class="layui-form-label">赛事id</label>
             <div class="layui-input-block">
                 <input type="text" name="id" required  lay-verify="required" placeholder="" autocomplete="off" value="{{ isset($id)?$id:'' }}" class="layui-input">
             </div>
         </div>
+        -->
+        
         <div class="layui-form-item">
             <label class="layui-form-label">主队名称</label>
             <div class="layui-input-block">
@@ -66,7 +69,7 @@
         <div class="layui-form-item">
             <label class="layui-form-label">客队名称</label>
             <div class="layui-input-block">
-                <input type="text" name="guest_team" lay-verify="" placeholder="请输入客队名称" autocomplete="off" class="layui-input"  value="{{ isset($guest_team)?$guest_team:'' }}" >
+                <input type="text" name="guest_team" lay-verify="required" placeholder="请输入客队名称" autocomplete="off" class="layui-input"  value="{{ isset($guest_team)?$guest_team:'' }}" >
             </div>
         </div>
         <div class="layui-form-item">
@@ -87,21 +90,21 @@
         <div class="layui-form-item">
             <label class="layui-form-label">赛事日期</label>
             <div class="layui-input-block">
-                <input type="text" id="date" name="match_date" lay-verify="" autocomplete="off" class="layui-input"  value="" >
+                <input type="text" id="date" name="match_date" lay-verify="required" autocomplete="off" class="layui-input"  value="" >
                 <!-- <input type="date" name="match_date" lay-verify="" autocomplete="off" class="layui-input"  value="{{ isset($match_date)?$match_date:date('Y-m-d',time()) }}" > -->
             </div>
         </div>
         <div class="layui-form-item">
             <label class="layui-form-label">赛事时间</label>
             <div class="layui-input-block">
-                <input type="time" id='time' name="match_time" autocomplete="off" class="layui-input" value="" >
+                <input type="text" id='time' name="match_time" lay-verify="required" autocomplete="off" class="layui-input" value="" >
                 <!-- <input type="time" name="match_time" autocomplete="off" class="layui-input" value="{{ isset($match_time)?$match_time:date('H:i',time()) }}" > -->
             </div>
         </div>
         {{--<div class="layui-form-item">--}}
         {{--<label class="layui-form-label">赛事状态</label>--}}
         {{--<div class="layui-input-block">--}}
-        {{--<input type="text" name="status"   lay-verify="" placeholder="请输入赛事状态 0:未开始 1:正在进行  2:已结束" autocomplete="off" class="layui-input"  value="{{ isset($status)?$status:'' }}" >--}}
+        {{--<input type="text" name="status"   lay-verify="required" placeholder="请输入赛事状态 0:未开始 1:正在进行  2:已结束" autocomplete="off" class="layui-input"  value="{{ isset($status)?$status:'' }}" >--}}
         {{--</div>--}}
         {{--</div>--}}
         <div class="layui-form-item">
@@ -214,12 +217,14 @@
                 return true;
             });
         });
+        /*
         function cbFormSuccess(data){
             layer.msg(data.msg);
             setTimeout(function(){
                 parent.window.location.reload();
             },2500);
         }
+        */
     </script>
 
     <script type='text/javascript'>
@@ -233,6 +238,7 @@
         laydate.render({ 
             elem: '#time'
             ,type: 'time'
+            ,format: 'H:mm' //可任意组合
         });
 
     </script>

+ 4 - 1
resources/views/sports/basket_form.blade.php

@@ -41,7 +41,7 @@
         <div class="layui-form-item">
             <label class="layui-form-label">赛事时间</label>
             <div class="layui-input-block">
-                <input type="time" id='time' name="match_time" autocomplete="off" class="layui-input" value="" >
+                <input type="text" id='time' name="match_time" autocomplete="off" class="layui-input" value="" >
                 <!-- <input type="time" name="match_time" autocomplete="off" class="layui-input" value="{{ isset($match_time)?$match_time:date('H:i',time()) }}" > -->
             </div>
         </div>
@@ -156,12 +156,14 @@
                 return true;
             });
         });
+        /*
         function cbFormSuccess(data){
             layer.msg(data.msg);
             setTimeout(function(){
                 parent.window.location.reload();
             },2500);
         }
+        */
     </script>
      <script type='text/javascript'>
         laydate.render({
@@ -174,6 +176,7 @@
         laydate.render({ 
             elem: '#time'
             ,type: 'time'
+            ,format: 'H:mm' //可任意组合
         });
 
     </script>

+ 7 - 4
resources/views/sports/soccer_form.blade.php

@@ -11,7 +11,7 @@
         <div class="layui-form-item">
             <label class="layui-form-label">客队名称</label>
             <div class="layui-input-block">
-                <input type="text" name="guest_team" lay-verify="" placeholder="请输入客队名称" autocomplete="off" class="layui-input"  value="{{ isset($guest_team)?$guest_team:'' }}" >
+                <input type="text" name="guest_team" lay-verify="required" placeholder="请输入客队名称" autocomplete="off" class="layui-input"  value="{{ isset($guest_team)?$guest_team:'' }}" >
             </div>
         </div>
         <div class="layui-form-item">
@@ -32,14 +32,14 @@
         <div class="layui-form-item">
             <label class="layui-form-label">赛事日期</label>
             <div class="layui-input-block">
-                <input type="text" id="date" name="match_date" lay-verify="" autocomplete="off" class="layui-input"  value="" >
+                <input type="text" id="date" name="match_date" lay-verify="required" autocomplete="off" class="layui-input"  value="" >
                 <!-- <input type="date" name="match_date" lay-verify="" autocomplete="off" class="layui-input"  value="{{ isset($match_date)?$match_date:date('Y-m-d',time()) }}" > -->
             </div>
         </div>
         <div class="layui-form-item">
             <label class="layui-form-label">赛事时间</label>
             <div class="layui-input-block">
-                <input type="time" id='time' name="match_time" autocomplete="off" class="layui-input" value="" >
+                <input type="time" id='time' name="match_time" lay-verify="required" autocomplete="off" class="layui-input" value="" >
                 <!-- <input type="time" name="match_time" autocomplete="off" class="layui-input" value="{{ isset($match_time)?$match_time:date('H:i',time()) }}" > -->
             </div>
         </div>
@@ -49,7 +49,7 @@
                 @if(isset($match_status))
                     @foreach($match_status as $k=>$v)
                         {{--@if(isset($status))--}}
-                        <input type="radio" name="status" value="{{$v['status']}}" title="{{$v['name']}}" @if($status==$v['status']) checked @endif >
+                        <input type="radio" name="status" lay-verify="required" value="{{$v['status']}}" title="{{$v['name']}}" @if($status==$v['status']) checked @endif >
                         {{--@else--}}
                             {{--<input type="radio" name="status" value="{{$v['status']}}" title="{{$v['name']}}">--}}
                         {{--@endif--}}
@@ -152,12 +152,14 @@
                 return true;
             });
         });
+        /*
         function cbFormSuccess(data){
             layer.msg(data.msg);
             setTimeout(function(){
                 parent.window.location.reload();
             },2500);
         }
+        */
     </script>
 
     <script type='text/javascript'>
@@ -171,6 +173,7 @@
         laydate.render({ 
             elem: '#time'
             ,type: 'time'
+            ,format: 'H:mm' //可任意组合
         });
 
     </script>

+ 4 - 1
resources/views/sports/tennis_form.blade.php

@@ -39,7 +39,7 @@
         <div class="layui-form-item">
             <label class="layui-form-label">赛事时间</label>
             <div class="layui-input-block">
-                <input type="time" id='time' name="match_time" autocomplete="off" class="layui-input" value="" >
+                <input type="text" id='time' name="match_time" autocomplete="off" class="layui-input" value="" >
                 <!-- <input type="time" name="match_time" autocomplete="off" class="layui-input" value="{{ isset($match_time)?$match_time:date('H:i',time()) }}" > -->
             </div>
         </div>
@@ -154,12 +154,14 @@
                 return true;
             });
         });
+        /*
         function cbFormSuccess(data){
             layer.msg(data.msg);
             setTimeout(function(){
                 parent.window.location.reload();
             },2500);
         }
+        */
     </script>
      <script type='text/javascript'>
         laydate.render({
@@ -172,6 +174,7 @@
         laydate.render({ 
             elem: '#time'
             ,type: 'time'
+            ,format: 'H:mm' //可任意组合
         });
 
     </script>