异常处理

app/Http/Controllers/Admin/AdminlogController.php

@@ -18,11 +18,18 @@ class AdminlogController extends Controller
     {
         $request = array();
         $request['loginname'] = isset($req->loginname) ? trim($req->loginname) : null;
-        $request['sureblur'] = isset($req->sureblur) ? 0 : '2';
+        if (!isset($req->isinit)) {
+            $request['sureblur'] = 1;
+        } else {
+            $request['sureblur'] = (isset($_REQUEST['sureblur']) && !empty($request['loginname'])) ? 1 : 0;
+        }
+
+
         $request['ip'] = isset($req->ip) ? trim($req->ip) : null;
         $request['operation'] = isset($req->operation) ? trim($req->operation) : 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');
+
         $dt = \App\Lib\DataTable\DataTable::init();
         $dt->setDataSource('/admin/manager/systemLog');
         $dt->setLang('system_user');

app/Http/Controllers/Admin/MenuController.php

@@ -211,7 +211,7 @@ class MenuController extends Controller {
 		$dt->addColsFields('sort', array('width' => 85));
 		$dt->addColsFields('parent_id', array('sort' => false, 'width' => 100));
 		$dt->addColsFields('parent_name', array('sort' => false, 'width' => 150));
-		$dt->addColsFields('target', array('sort' => false, 'width' => 150));
+		//$dt->addColsFields('target', array('sort' => false, 'width' => 150));
 		$dt->enableCheckBox();
 		$arr[] = 'view';
 		if (checkRriv('/admin/Menu/edit')) {

app/Http/Controllers/Admin/SoccerNoteListController.php

@@ -58,6 +58,88 @@ class SoccerNoteListController extends Controller
         return view('sports/sports_notelist', $dt->render($request));
     }
 
+    //修改冠军单订单结果
+    function orderupgj(Req $req){
+        $id = $req->id;//37
+        $orderid = $req->order;//S20190916094723915270970
+        if (intval($id) < 1) {
+            return -1;
+        }
+
+        $data = \App\Models\SoccerLeague::where('id',$id)->first();
+
+        $odds_code = \App\Models\SoccerOdds::where('lg_id',$id)->where('type',1)->where('odds_code','!=','')->select('odds_code')->distinct()->get()->toArray();//赔率表
+
+        for ($i=0; $i < count($odds_code); $i++) { 
+            $allteam[] = \App\Models\SoccerOdds::where('odds_code',$odds_code[$i]['odds_code'])->where('lg_id',$id)->where('type',1)->select('team')->distinct()->get()->toArray();
+        }
+
+        $data = $data->toArray();
+        $isdisplay = \App\Models\Stwqleagueresult::where(['lg_id'=>$id,'status'=>1])->select("game_name")->distinct()->get()->toArray();
+        $idisplay = array_column($isdisplay,'game_name');
+        $displays = implode(",",$idisplay);//转换成字符串
+
+        //新增纪录
+        foreach($odds_code as $k => $v) {
+            foreach($allteam[$k] as $kk => $vv) {
+                $name = $v['odds_code'];
+                $isteam = $allteam[$k][$kk]['team'];
+                $res = \App\Models\Stwqleagueresult::where(['lg_id'=>$id,'game_name'=>$name,'result'=>$isteam])->first();
+
+                $addresult = [
+                    'lg_id' => $id,
+                    'game_name' => $name,
+                    'result' => $isteam,
+                    'ctime' => date('Y-m-d H:i:s',time()),
+                    'status' => 0,
+                    'updated_at' => date('Y-m-d H:i:s',time()),
+                ];
+
+                if(empty($res)){
+                    \App\Models\Stwqleagueresult::insert($addresult);
+                }
+
+            }
+        }
+        $orderjg = \App\Models\SportsNoteList::where(['order_id'=>$orderid])->select("single_result")->first();
+        $orderjg = json_decode($orderjg['single_result'],true);
+
+        $data['allteam'] = $allteam;
+        $data['odds_code'] = $odds_code;
+        $data['displays'] = $displays;
+        $data['isdisplay'] = $isdisplay;
+        $data['orderjg'] = $orderjg;
+        $data['orderid'] = $orderid;
+        $data['lg_id'] = $id;
+
+        return view('sports/orderupgj',$data);
+    }
+
+    //修改冠军单订单结果提交
+    function ajaxtj(Req $req){
+        $isstatus = $req->isstatus;//更新
+        $order = $req->order;
+
+        if($isstatus){
+            $gjresult = array(
+                'lg_id'=>$req->lg_id?$req->lg_id:'',
+                'game_name'=> $req->odds_code?$req->odds_code:'',
+                'result'=> $req->team?$req->team:'',
+                'updatetime' => date("Y-m-d H:i:s",time()),
+            );
+        }else{
+            $gjresult = array(
+                'lg_id'=>'',
+                'game_name'=>'',
+                'result'=>'',
+            );
+        }
+
+        \App\Models\SportsNoteList::where(['order_id'=>$order])->update(['single_result'=>json_encode($gjresult,JSON_UNESCAPED_UNICODE)]);
+        
+        return responseToJson(1);
+    }
+
     function info()
     {
         $page = Request::has('page') ? Request::get('page') : '';
@@ -485,11 +567,11 @@ class SoccerNoteListController extends Controller
     public function delete(Req $req) {
         $id = $req->input('id');
         if (empty($id)) {
-            return responseToJson(-2001); //id������
+            return responseToJson(-2001); //id
         }
         $ids = explode(',', $id);
         if (!is_array($ids) && intval($ids) < 0) {
-            return responseToJson(-2002); //id����
+            return responseToJson(-2002); //id
         }
         if (is_array($ids) && count($ids) > 0) {
             foreach ($ids as $k => $v) {
@@ -501,9 +583,9 @@ class SoccerNoteListController extends Controller
 
         $rows = \App\Models\SportsNoteList::whereIn('id', $ids)->delete();
         if (!$rows) {
-            return responseToJson(-2003); //id����
+            return responseToJson(-2003); //id
         }
-        return responseToJson(1, trans('menu.delete_success')); //id����
+        return responseToJson(1, trans('menu.delete_success')); //id
 
     }
 

app/Http/Controllers/Api/SettlementController.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Api;
 
 use App\Http\Model\StSettlementMiddleDetail;
 use App\Lib\Settlement\Adapter\RulePlus;
+use App\Lib\Settlement\Adapter\ZqRule;
 use App\Lib\Settlement\SettlementOrder;
 use App\Lib\Settlement\Adapter\WqRule;
 
@@ -34,10 +35,17 @@ class SettlementController extends Controller
     public function debug()
     {
 
-        $match = DB::table('money_buy_match')->where(['batch_id' => '156741065534'])->first();
-        //$result = DB::table('st_zq_result')->where(['match_id' => '605'])->get();
-        $result = DB::table('st_wq_result')->where(['id' => '20'])->get();
-        $rule = new  WqRule();
+        $match = DB::table('money_buy_match')->where(['batch_id' => '20190916094717519851520'])->first();
+        $result = DB::table('st_zq_result')->where(['match_id' => '2115'])->get();
+        //$result = DB::table('st_wq_result')->where(['id' => '20'])->get();
+        $rule = new  ZqRule();
+        $resultb = $rule->GunqiuWeixian($match, $result, []);
+
+        print_r($match);
+        print_r($result);
+        print_r($resultb);
+        return;
+
 
         //print_r([$match, $result]);
         // return ;

app/Http/Model/StZqResult.php

@@ -229,11 +229,12 @@ class StZqResult extends Model
             }
         }
 
+
         $match_ids_str = implode(",", $match_ids);
         
         //上半场
         $sql_h = "select a.match_id,a.home_score,a.guest_score,a.match_time as a_time,a.match_process,a.all_goal,a.first_score,a.last_score,a.match_score,a.match_winer from st_zq_result_record a,
-        (select match_id,max(id) id from st_zq_result_record where match_process = '上半场' and match_id IN ($match_ids_str) group by match_id)b
+        (select match_id,max(id) id from st_zq_result_record where match_process = '半场' and match_id IN ($match_ids_str) group by match_id)b
         where a.match_id = b.match_id and a.id = b.id ";
 
         //全场
@@ -241,11 +242,13 @@ class StZqResult extends Model
         (select match_id,max(id) id from st_zq_result_record where match_id IN ($match_ids_str) group by match_id)b
         where a.match_id = b.match_id and a.id = b.id ";
 
+
         //上半场最终结果
         $match_result_h = DB::select($sql_h);
 
         //全场最终结果
         $match_result_f = DB::select($sql_f);
+
         //拼装赛事结果数据
         $match_result_record = [];
         if(!empty($match_result_h) and !empty($match_result_f)){

resources/views/admin/SystemManage/LogList.blade.php

@@ -38,12 +38,13 @@
                             <input type="text" name="loginname" id="loginname" lay-verify="required"
                                    eventType="event-query" value="{{ $loginname }}" autocomplete="off"
                                    class="layui-input">
+                            <input type="hidden" name="isinit" value="1">
                         </div>
 
                         <div class="layui-input-inline checkbox">
                             <input type="checkbox" name="sureblur" id="sureblur" eventType="event-query"
                                    value="{{$sureblur}}"
-                                   lay-skin="switch" lay-text="模糊|精确"  @if ($sureblur=='0')checked @endif>
+                                   lay-skin="switch" lay-text="精确|模糊" @if ($sureblur>0)checked @endif>
                         </div>
 
                     </div>

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

@@ -340,6 +340,9 @@
                     }else if(data.status==4){
                         layer.msg(data.msg);
                         reloadDataTable();return false;
+                    }else if(data.status==5){
+                        layer.msg(data.msg);
+                        reloadDataTable();return false;
                     }else{
                         layer.msg(data.msg);
                         reloadDataTable();return false;

resources/views/admin/wagent/edit.blade.php

@@ -68,15 +68,6 @@
                 }
             });
 
-
-
-            form.on('submit(upmoneyfiter)', function (data) {
-                console.log(data);
-                return false;
-                layer.msg(JSON.stringify(data.field));
-                return false;
-            });
-
             //监听提交
             form.on('submit(submitForm)', function (data) {
                 return true;

resources/views/sports/orderupgj.blade.php

@@ -0,0 +1,97 @@
+@extends('vip.layouts')
+@section('content')
+    <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">联赛名称</label>
+            <div class="layui-input-block">
+                <input type="text" name="name_chinese" required  lay-verify="required" placeholder="请输入联赛名称" autocomplete="off" value="{{ isset($name_chinese)?$name_chinese:'' }}" class="layui-input" readonly="readonly">
+            </div>
+        </div>
+
+        @foreach ($odds_code as $k=>$user)
+            <div class="layui-form-item">
+                <label class="layui-form-label">{{$user['odds_code']}}</label>
+                <div class="layui-input-block">
+                    @foreach ($allteam[$k] as $kk=>$post)
+                    <div style="padding-left:20px;width:100px;height: 80px; float: left;">{{$allteam[$k][$kk]['team']}}
+                    @if ($allteam[$k][$kk]['team']==$orderjg['result'])
+                        <div onclick="iskq(0,'{{$allteam[$k][$kk]["team"]}}','{{$order}}','{{$user["odds_code"]}}',{{$lg_id}})" class="layui-input-inline checkbox">
+                            <input type="checkbox" checked lay-skin="switch" lay-text="是|否" class="layui-input" eventType=event-query>
+                        </div>
+                    @else
+                        <div onclick="iskq(1,'{{$allteam[$k][$kk]["team"]}}','{{$order}}','{{$user["odds_code"]}}',{{$lg_id}})" class="layui-input-inline checkbox">
+                            <input type="checkbox" lay-skin="switch" lay-text="是|否" class="layui-input" eventType=event-query>
+                        </div>
+                    @endif
+                    </div>
+                    @endforeach
+                </div>
+            </div>
+        @endforeach
+
+        <!-- @if(S('ACTION')!='view')
+            <div class="layui-form-item">
+                <div class="layui-input-block">
+                    <a class="layui-btn layui-btn-sm lay-btn-diy" href="javascript:history.go(-1)" style="background-color:#1E9FFF;width: 92px; height: 38px;line-height: 38px;font-size: 14px;">返回</a>
+                    <button class="layui-btn" lay-submit lay-filter="submitForm">立即提交</button>
+                    <button type="reset" class="layui-btn layui-btn-primary">重置</button>
+                </div>
+            </div>
+        @endif -->
+    </form>
+
+  
+    <script>
+        var id;
+        var aa;
+        layui.use(['form'], function(){
+            var form = layui.form;
+            form.on('select(sect)',function(data){
+                id = data.value;
+                //console.log(id);
+                $.ajax({
+                    type:'get',
+                    url:'/admin/TennisLeague/getcountry',
+                    data:{id:id},
+                    dataType:'json',
+                    success:function(data){  //请求成功回调函数
+                        //console.log(data);
+                        var option = '';
+                        var dd = '';
+                        option += '<option value></option>';
+                        //dd += '<dd lay-value class="layui-select-tips">请选择</dd>';
+                        for(var i=0;i<data.length;i++){  //循环获取返回值，并组装成html代码
+                            option += "<option value="+data[i]["id"]+">"+data[i]["name"]+"</option>";
+                        }
+                        $("#country").html(option);
+                        //重新渲染select
+                        form.render('select');
+                    },
+                });
+            })
+            //监听提交
+            form.on('submit(submitForm)', function(data){
+                return true;
+            });
+        });
+
+        function iskq(isstatus,team,order,odds_code,lg_id){
+            $.ajax({
+                type: 'POST',
+                dataType: 'json',
+                url: '/admin/SoccerNoteList/ajaxtj',
+                data: {isstatus:isstatus,team:team,order:order,odds_code:odds_code,lg_id:lg_id},
+                success: function(data) {
+                    if(data.status==1){
+                        layer.msg('更新成功！！！');
+                        location. reload()//刷新当前页面
+                    }else{
+                        layer.msg('更新失败,请联系管理员');
+                        location. reload()//刷新当前页面
+                    }
+                }
+            })
+        }
+    </script>
+@endsection

resources/views/sports/sports_notelist.blade.php

@@ -5,7 +5,11 @@
 @section('content')
   
     <script type="text/html" id="game_status">
-        <button onclick="addResult('@{{d.id}}','{{$type}}')" class="layui-btn layui-btn-sm layui-btn-green set">修改结果</button>
+        @{{#if(d.is_champion==1){ }}
+            <a href="/admin/SoccerNoteList/orderupgj?id=@{{d.lg_id}}&order=@{{d.order_id}}" class="layui-btn layui-btn-sm layui-btn-green set">修改结果</a>
+        @{{#}else{ }}
+            <button onclick="addResult('@{{d.id}}','{{$type}}')" class="layui-btn layui-btn-sm layui-btn-green set">修改结果</button>
+        @{{#} }}
 
         @{{#if(d.settle_status==1){ }} 
             <span>未结算</span>