异常处理

app/Http/Controllers/Admin/SportsBaseController.php

@@ -182,6 +182,9 @@ class SportsBaseController extends Controller {
                     $parents[$k]['name']=$lange[$arr];
                 }
             }
+            $data['match_date'] = date('Y-m-d');
+            $data['match_time'] = date('H:i:s');
+
             $data['parents'] = $parents;
             return view('sports.base_form', $data);
         } else {
@@ -402,6 +405,7 @@ class SportsBaseController extends Controller {
         $request['status'] = isset($req->status) ? trim($req->status) : '-1';
         $request['p_code'] = isset($req->p_code) ? trim($req->p_code) : '-1';
         $request['id'] = isset($req->id) ? trim($req->id) : null;
+        $request['odds_id'] = isset($req->odds_id) ? trim($req->odds_id) : '';
         $newapp = \App\Models\SportsBase::where('id',$request['id'])->first();
         // $match_id = $newapp->match_id;
         if(empty($newapp)){
@@ -442,6 +446,7 @@ class SportsBaseController extends Controller {
     function oddsinfo(Req $req){
         $lange = trans('sportsoddscode');
         $match_id = $req->match_id;
+        $odds_id = Request::has('odds_id') ? Request::get('odds_id') : '';
         $p_code = Request::has('p_code') ? Request::get('p_code') : '';
         $status = Request::has('status') ? Request::get('status') : '';
         $where = array();
@@ -454,6 +459,9 @@ class SportsBaseController extends Controller {
             } 
             $where[] = array('st_bq_odds.status', '=', $status);
         }
+        if(!empty($odds_id)){
+            $where[] = array('st_zq_odds.id', '=', $odds_id);
+        }
 
         if (intval($match_id) < 1) {
             return -1;

app/Http/Controllers/Admin/SportsBasketController.php

@@ -181,6 +181,9 @@ class SportsBasketController extends Controller {
 					$parents[$k]['name']=$lange[$arr];
 				}
 			}
+			$data['match_date'] = date('Y-m-d');
+            $data['match_time'] = date('H:i:s');
+
 			$data['parents'] = $parents;
 			return view('sports.basket_form', $data);
 		} else {
@@ -400,6 +403,7 @@ class SportsBasketController extends Controller {
 		$request['status'] = isset($req->status) ? trim($req->status) : '-1';
 		$request['p_code'] = isset($req->p_code) ? trim($req->p_code) : '-1';
 		$request['id'] = isset($req->id) ? trim($req->id) : null;
+        $request['odds_id'] = isset($req->odds_id) ? trim($req->odds_id) : '';
 		$newapp = \App\Models\SportsBasket::where('id',$request['id'])->first();
 		// $match_id = $newapp->match_id;
 		if(empty($newapp)){
@@ -438,6 +442,7 @@ class SportsBasketController extends Controller {
 	function oddsinfo(Req $req){
 		$lange = trans('sportsoddscode');
 		$match_id = $req->match_id;
+        $odds_id = Request::has('odds_id') ? Request::get('odds_id') : '';
 		$p_code = Request::has('p_code') ? Request::get('p_code') : '';
 		$status = Request::has('status') ? Request::get('status') : '';
 		$where = array();
@@ -450,6 +455,9 @@ class SportsBasketController extends Controller {
             } 
 			$where[] = array('st_lq_odds.status', '=', $status);
 		}
+		if(!empty($odds_id)){
+            $where[] = array('st_zq_odds.id', '=', $odds_id);
+        }
 
 		if (intval($match_id) < 1) {
 			return -1;

app/Http/Controllers/Admin/SportsSoccerController.php

@@ -194,6 +194,9 @@ class SportsSoccerController extends Controller
                 }
             }
             $data['parents'] = $parents;
+            $data['match_date'] = date('Y-m-d');
+            $data['match_time'] = date('H:i:s');
+
             return view('sports.soccer_form', $data);
         } else {
             $model = new \App\Models\SportsSoccer();
@@ -246,7 +249,7 @@ class SportsSoccerController extends Controller
     }
 
     /**
-     *修改赛事
+     *修改赛事1
      */
     function edit(Req $req)
     {
@@ -420,6 +423,7 @@ class SportsSoccerController extends Controller
         $request['status'] = isset($req->status) ? trim($req->status) : '-1';
         $request['p_code'] = isset($req->p_code) ? trim($req->p_code) : '-1';
         $request['id'] = isset($req->id) ? trim($req->id) : null;
+        $request['odds_id'] = isset($req->odds_id) ? trim($req->odds_id) : '';
         $newapp = \App\Models\SportsSoccer::where('id', $request['id'])->first();
 
         if (empty($newapp)) {
@@ -461,6 +465,7 @@ class SportsSoccerController extends Controller
     {
         $lange = trans('sportsoddscode');
         $match_id = $req->match_id;
+        $odds_id = Request::has('odds_id') ? Request::get('odds_id') : '';
         $p_code = Request::has('p_code') ? Request::get('p_code') : '';
         $status = Request::has('status') ? Request::get('status') : '';//状态 默认0启用 1停用 -1禁用
         $where = array();
@@ -473,6 +478,9 @@ class SportsSoccerController extends Controller
             } 
             $where[] = array('st_zq_odds.status', '=', $status);
         }
+        if(!empty($odds_id)){
+            $where[] = array('st_zq_odds.id', '=', $odds_id);
+        }
 
         if (intval($match_id) < 1) {
             return -1;

app/Http/Controllers/Admin/SportsTennisController.php

@@ -180,6 +180,9 @@ class SportsTennisController extends Controller {
                     $parents[$k]['name']=$lange[$arr];
                 }
             }
+            $data['match_date'] = date('Y-m-d');
+            $data['match_time'] = date('H:i:s');
+
             $data['parents'] = $parents;
             return view('sports.tennis_form', $data);
         } else {
@@ -401,6 +404,7 @@ class SportsTennisController extends Controller {
         $request['status'] = isset($req->status) ? trim($req->status) : '-1';
         $request['p_code'] = isset($req->p_code) ? trim($req->p_code) : '-1';
         $request['id'] = isset($req->id) ? trim($req->id) : null;
+        $request['odds_id'] = isset($req->odds_id) ? trim($req->odds_id) : '';
         $newapp = \App\Models\SportsTennis::where('id',$request['id'])->first();
         // $match_id = $newapp->match_id;
         if(empty($newapp)){
@@ -439,6 +443,7 @@ class SportsTennisController extends Controller {
     function oddsinfo(Req $req){
         $lange = trans('sportsoddscode');
         $match_id = $req->match_id;
+        $odds_id = Request::has('odds_id') ? Request::get('odds_id') : '';
         $p_code = Request::has('p_code') ? Request::get('p_code') : '';
         $status = Request::has('status') ? Request::get('status') : '';
         $where = array();
@@ -451,6 +456,9 @@ class SportsTennisController extends Controller {
             } 
             $where[] = array('st_wq_odds.status', '=', $status);
         }
+        if(!empty($odds_id)){
+            $where[] = array('st_zq_odds.id', '=', $odds_id);
+        }
 
         if (intval($match_id) < 1) {
             return -1;

app/Http/Controllers/Api/SettlementController.php

@@ -46,13 +46,19 @@ class SettlementController extends Controller
 
     public function debug(Req $req)
     {
-        $auto = new SettlementAuto();
-        $auto->doAutoSett();
 
-        return;
+        /*
+        $model = new ComendnoticeModel();
+        $need = $model->getNeedSettelent() ;
+        var_dump($need);
+        exit ;
+        */
 
 
-        print_r($_SERVER);
+        $auto = new SettlementAuto();
+        $auto->doAutoSett();
+        //return;
+        //print_r($_SERVER);
         exit;
 
         $model = new MoneyBuyMatchModel();

app/Lib/Settlement/SettlementAuto.php

@@ -45,7 +45,7 @@ class SettlementAuto
         $model->status = 1;
         $model->save();
 
-        $mbmm = new MoneyBuyMatchModel();
+        $mbmm = (new MoneyBuyMatchModel())->countByMatch($model->match_id,$model->game_code);
         $count = $mbmm['count'];
         if (!$count) {
             $model->status = 4;

app/Models/Comendnotice.php

@@ -43,7 +43,7 @@ class Comendnotice extends BaseModel
         $lastDay = date("Y-m-d H:i:s", time() - 86400 * 30);
         $now = date("Y-m-d H:i:s", time() - 5 * 36000);
 
-        $model = $this->where([['game_start_time', '<=', $now], ['game_start_time', '>=', $lastDay], ['ctime', '>=', $lastDay], ['pcount', '=', 0]])->orderBy('game_start_time', 'asc')->first();
+        $model = $this->where([['game_start_time', '<=', $now], ['game_start_time', '>=', $lastDay], ['ctime', '>=', $lastDay], ['pcount', '=', 0]])->orderBy('game_start_time', 'desc')->first();
         return $model;
     }
 

app/Models/MoneyBuyMatch.php

@@ -70,12 +70,12 @@ class MoneyBuyMatch extends Model
     }
 
     //某个赛事的单式和串式条数统计
-    public function countByMatch($matchID)
+    public function countByMatch($matchID, $game_code)
     {
         $matchID = intval($matchID);
 
-        $sqla = "select count(id) as mcount from  money_buy_match where match_id=$matchID and  bet_type=1 and   order_id in( select order_id from  money_buy_simplex where match_id=$matchID and is_manual=0 )";
-        $sqlb = "select count(id) as mcount from  money_buy_match where match_id=$matchID and  bet_type=2 ";
+        $sqla = "select count(id) as mcount from  money_buy_match where match_id=$matchID and game_code='$game_code' and  bet_type=1 and   order_id in( select order_id from  money_buy_simplex where match_id=$matchID and  game_code='$game_code' and is_manual=0 )";
+        $sqlb = "select count(id) as mcount from  money_buy_match where match_id=$matchID and game_code='$game_code' and  bet_type=2 ";
 
         $reta = DB::select($sqla);
         $retb = DB::select($sqlb);

resources/views/sports/base_form.blade.php

@@ -90,14 +90,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="required" autocomplete="off" class="layui-input"  value="" >
+                <input type="text" id="date" name="match_date" lay-verify="required" autocomplete="off" class="layui-input"  value="{{$match_date}}" >
                 <!-- <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="text" id='time' name="match_time" lay-verify="required" autocomplete="off" class="layui-input" value="" >
+                <input type="text" id='time' name="match_time" lay-verify="required" autocomplete="off" class="layui-input" value="{{$match_time}}" >
                 <!-- <input type="time" name="match_time" autocomplete="off" class="layui-input" value="{{ isset($match_time)?$match_time:date('H:i',time()) }}" > -->
             </div>
         </div>
@@ -228,17 +228,18 @@
     </script>
 
     <script type='text/javascript'>
-        laydate.render({
+         laydate.render({
             elem: '#date'
-            ,value: '2017-09-10'
-            ,isInitValue: false //是否允许填充初始值，默认为 true
+            ,type: 'date' 
+            // ,value: new Date()
+            // ,isInitValue: false //是否允许填充初始值，默认为 true
         });
 
         //时间选择器
         laydate.render({ 
             elem: '#time'
             ,type: 'time'
-            ,format: 'H:mm' //可任意组合
+            // ,format: 'H:mm:ss' //可任意组合
         });
 
     </script>

resources/views/sports/base_odds.blade.php

@@ -40,7 +40,8 @@
                         <label class="layui-form-label">{{ trans('sportssoccer.odds_search') }}</label>
                         <div class="layui-input-inline">
                             <!-- <input type="text" name="id" id="id" eventType="event-query"  value="{{ $id }}" lay-verify="required" autocomplete="off" class="layui-input" readonly="readonly"> -->
-                            <input type="text" name="id" id="id" eventType="event-query"  value="" lay-verify="required" autocomplete="off" class="layui-input"  placeholder="输入赔率ID">
+                            <input type="hidden" name="id" id="id" eventType="event-query"  value="{{$id}}" lay-verify="required" autocomplete="off" class="layui-input">
+                            <input type="text" name="odds_id" id="odds_id" eventType="event-query"  value="{{$odds_id}}" lay-verify="number" autocomplete="off" class="layui-input"  placeholder="输入赔率ID">
                         </div>
                         {{--<div class="layui-input-inline checkbox">--}}
                         {{--<input type="checkbox" name="sureblur" id="sureblur" lay-skin="switch" lay-text="精确|模糊" checked>--}}

resources/views/sports/basket_form.blade.php

@@ -34,14 +34,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="" autocomplete="off" class="layui-input"  value="{{$match_date}}" >
                 <!-- <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="text" 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="{{$match_time}}" >
                 <!-- <input type="time" name="match_time" autocomplete="off" class="layui-input" value="{{ isset($match_time)?$match_time:date('H:i',time()) }}" > -->
             </div>
         </div>
@@ -166,17 +166,18 @@
         */
     </script>
      <script type='text/javascript'>
-        laydate.render({
+         laydate.render({
             elem: '#date'
-            ,value: '2017-09-10'
-            ,isInitValue: false //是否允许填充初始值，默认为 true
+            ,type: 'date' 
+            // ,value: new Date()
+            // ,isInitValue: false //是否允许填充初始值，默认为 true
         });
 
         //时间选择器
         laydate.render({ 
             elem: '#time'
             ,type: 'time'
-            ,format: 'H:mm' //可任意组合
+            // ,format: 'H:mm:ss' //可任意组合
         });
 
     </script>

resources/views/sports/basket_odds.blade.php

@@ -39,7 +39,8 @@
                     <div class="layui-inline">
                         <label class="layui-form-label">{{ trans('sportssoccer.odds_search') }}</label>
                         <div class="layui-input-inline">
-                            <input type="text" name="id" id="id" eventType="event-query"  value="" lay-verify="required" autocomplete="off" class="layui-input"  placeholder="输入赔率ID">
+                            <input type="hidden" name="id" id="id" eventType="event-query"  value="{{$id}}" lay-verify="required" autocomplete="off" class="layui-input">
+                            <input type="text" name="odds_id" id="odds_id" eventType="event-query"  value="{{$odds_id}}" lay-verify="number" autocomplete="off" class="layui-input"  placeholder="输入赔率ID">
                             <!-- <input type="text" name="id" id="id" eventType="event-query"  value="{{ $id }}" lay-verify="required" autocomplete="off" class="layui-input" readonly="readonly"> -->
                         </div>
                         {{--<div class="layui-input-inline checkbox">--}}

resources/views/sports/soccer_form.blade.php

@@ -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="required" autocomplete="off" class="layui-input"  value="" >
+                <input type="text" id="date" name="match_date" lay-verify="required" autocomplete="off" class="layui-input"  value="{{$match_date}}" >
                 <!-- <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" lay-verify="required" autocomplete="off" class="layui-input" value="" >
+                <input type="time" id='time' name="match_time" lay-verify="required" autocomplete="off" class="layui-input" value="{{$match_time}}" >
                 <!-- <input type="time" name="match_time" autocomplete="off" class="layui-input" value="{{ isset($match_time)?$match_time:date('H:i',time()) }}" > -->
             </div>
         </div>
@@ -165,15 +165,16 @@
     <script type='text/javascript'>
         laydate.render({
             elem: '#date'
-            ,value: '2017-09-10'
-            ,isInitValue: false //是否允许填充初始值，默认为 true
+            ,type: 'date' 
+            // ,value: new Date()
+            // ,isInitValue: false //是否允许填充初始值，默认为 true
         });
 
         //时间选择器
         laydate.render({ 
             elem: '#time'
             ,type: 'time'
-            ,format: 'H:mm' //可任意组合
+            // ,format: 'H:mm:ss' //可任意组合
         });
 
     </script>

resources/views/sports/soccer_odds.blade.php

@@ -39,7 +39,10 @@
                     <div class="layui-inline">
                         <label class="layui-form-label">{{ trans('sportssoccer.odds_search') }}</label>
                         <div class="layui-input-inline">
-                            <input type="text" name="id" id="id" eventType="event-query"  value="" lay-verify="required" autocomplete="off" class="layui-input"  placeholder="输入赔率ID">
+                            <input type="hidden" name="id" id="id" eventType="event-query"  value="{{$id}}" lay-verify="required" autocomplete="off" class="layui-input">
+                            <input type="text" name="odds_id" id="odds_id" eventType="event-query"  value="{{$odds_id}}" lay-verify="number" autocomplete="off" class="layui-input"  placeholder="输入赔率ID">
+
+                            <!-- <input type="text" name="id" id="id" eventType="event-query"  value="" lay-verify="required" autocomplete="off" class="layui-input"  placeholder="输入赔率ID"> -->
                         </div>
                         {{--<div class="layui-input-inline checkbox">--}}
                             {{--<input type="checkbox" name="sureblur" id="sureblur" lay-skin="switch" lay-text="精确|模糊" checked>--}}
@@ -80,7 +83,7 @@
 
                     <div class="layui-inline">
                         <a class="layui-btn layui-btn-sm lay-btn-diy" href="javascript:history.go(-1)" style="background-color:#1E9FFF;">返回</a>
-                        <a class="layui-btn layui-btn-sm lay-btn-diy"   data-type="reload" eventType="event-query-submit" style="opacity: 1; pointer-events: auto;">提交</a>
+                        <a class="layui-btn layui-btn-sm lay-btn-diy"  data-type="reload" eventType="event-query-submit" style="opacity: 1; pointer-events: auto;">提交</a>
                         <a  class="layui-btn   layui-btn-sm layui-btn-normal reset" data-type="reload" style="opacity: 1; pointer-events: auto;">重置</a>
                         <!-- <i class="layui-btn layui-btn-sm layui-btn-green set" data-type="reload" style="opacity: 1; pointer-events: auto;"><i class="layui-icon">ဂ</i></a> -->
                         <a class="layui-btn layui-btn-sm layui-laydate-range set" data-type="reload"
@@ -97,6 +100,7 @@
         </div>
     </div>
     @push('dataTableJS')
+   
     //var active = {
     //    reload: function(){
     //      //执行重载

resources/views/sports/tennis_form.blade.php

@@ -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="" autocomplete="off" class="layui-input"  value="{{$match_date}}" >
                 <!-- <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="text" 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="{{$match_time}}" >
                 <!-- <input type="time" name="match_time" autocomplete="off" class="layui-input" value="{{ isset($match_time)?$match_time:date('H:i',time()) }}" > -->
             </div>
         </div>
@@ -166,15 +166,16 @@
      <script type='text/javascript'>
         laydate.render({
             elem: '#date'
-            ,value: '2017-09-10'
-            ,isInitValue: false //是否允许填充初始值，默认为 true
+            ,type: 'date' 
+            // ,value: new Date()
+            // ,isInitValue: false //是否允许填充初始值，默认为 true
         });
 
         //时间选择器
         laydate.render({ 
             elem: '#time'
             ,type: 'time'
-            ,format: 'H:mm' //可任意组合
+            // ,format: 'H:mm:ss' //可任意组合
         });
 
     </script>

resources/views/sports/tennis_odds.blade.php

@@ -40,8 +40,8 @@
                         <label class="layui-form-label">{{ trans('sportssoccer.odds_search') }}</label>
                         <div class="layui-input-inline">
                             <!-- <input type="text" name="id" id="id" eventType="event-query"  value="{{ $id }}" lay-verify="required" autocomplete="off" class="layui-input" readonly="readonly"> -->
-                            <input type="text" name="id" id="id" eventType="event-query"  value="" lay-verify="required" autocomplete="off" class="layui-input"  placeholder="输入赔率ID">
-
+                            <input type="hidden" name="id" id="id" eventType="event-query"  value="{{$id}}" lay-verify="required" autocomplete="off" class="layui-input">
+                            <input type="text" name="odds_id" id="odds_id" eventType="event-query"  value="{{$odds_id}}" lay-verify="number" autocomplete="off" class="layui-input"  placeholder="输入赔率ID">
                         </div>
                         {{--<div class="layui-input-inline checkbox">--}}
                         {{--<input type="checkbox" name="sureblur" id="sureblur" lay-skin="switch" lay-text="精确|模糊" checked>--}}