异常处理

app/Http/Controllers/Admin/SoccerNoteListController.php

@@ -983,8 +983,14 @@ class SoccerNoteListController extends Controller
         if ($game_code == 'zq') {
             $home = intval($pdatas['home']);
             $guest = intval($pdatas['guest']);
+            $home_u = intval($pdatas['home_u']);
+            $guest_u = intval($pdatas['guest_u']);
+
             $restModel->home_score = $home;
             $restModel->guest_score = $guest;
+            $restModel->u_home_score = $home_u;
+            $restModel->u_guest_score = $guest_u;
+
             $restModel->corner_ball = json_decode($restModel->corner_ball, 256);
             $restModel->penalty_card = json_decode($restModel->penalty_card, 256);
             $restModel->first_score = json_decode($restModel->first_score, 256);
@@ -992,7 +998,9 @@ class SoccerNoteListController extends Controller
 
             $buyModel->single_result = json_encode([$restModel], 256);
             $buyModel->result_flag = 1;
+            $buyModel->is_manual = 1;
             $ret = $buyModel->save();
+            
             if ($ret) {
                 $ret2 = $this->do_win_set($order_id, $game_code, $match_id);
                 if ($ret2['status'] == 1) {
@@ -1009,6 +1017,20 @@ class SoccerNoteListController extends Controller
 
     }
 
+    //修复比分时用到订单信息及比赛结果数据
+    public function manualmatchget_v2(Req $req)
+    {
+        $order_id = isset($req->order_id) ? $req->order_id : 0;
+        $model = new  MoneyBuySimplexModel();
+        $ret = $model->OrderinfoResult($order_id);
+        if ($ret && !empty($ret['result'])) {
+            return responseToJson(1, '成功', $ret);
+        } else {
+            return responseToJson(-1, 'false', $ret);
+        }
+    }
+
+
     //先提交输赢，再结算
     private function do_win_set($order_id, $game_code, $match_id)
     {

app/Http/Controllers/Admin/SportsBaseController.php

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

app/Http/Controllers/Admin/SportsBasketController.php

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

app/Http/Controllers/Admin/SportsSoccerController.php

@@ -467,7 +467,7 @@ class SportsSoccerController extends Controller
         if (!empty($p_code) && $p_code != -1) {
             $where[] = array('st_zq_odds.p_code', '=', $p_code);
         }
-        if (!empty($status) && $status != '-1') {
+        if ($status != '-1') {
             if($status == 2){
                 $status = -1;
             } 

app/Http/Controllers/Admin/SportsTennisController.php

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

app/Http/Controllers/Admin/SportsbqController.php

@@ -54,6 +54,7 @@ class SportsbqController extends Controller {
 			} else {
 				if(is_numeric($home_team)){
 					$where[] = array('st_bq_result.match_id', '=', $home_team);
+                    $orwhere[] = array('st_bq_result.match_id', '=', $home_team);
 				}else{
 					$where[] = array('st_bq_result.home_team', '=', $home_team);
 					$orwhere[] = array('st_bq_result.guest_team', '=', $home_team);

app/Models/MoneyBuySimplex.php

@@ -1,8 +1,14 @@
 <?php
+
 namespace App\Models;
 
 use DB;
 
+use App\Models\Stzqresult;
+use App\Models\Stlqresult;
+use App\Models\Stbqresult;
+use App\Models\Stwqresult;
+
 class MoneyBuySimplex extends BaseModel
 {
 
@@ -10,5 +16,37 @@ class MoneyBuySimplex extends BaseModel
     public $timestamps = false;
 
 
+    //单式订单数据及比赛结果数据
+    public function OrderinfoResult($order_id)
+    {
+        $Ordermodel = $this->where('order_id', $order_id)->first();
+        if (empty($Ordermodel)) {
+            return false;
+        }
+        $game_code = $Ordermodel->game_code;
+        $match_id = $Ordermodel->match_id;
+
+        switch ($game_code) {
+            case 'zq':
+                $model = new Stzqresult();
+                break;
+            case 'lq':
+                $model = new Stlqresult();
+                break;
+            case 'bq':
+                $model = new Stbqresult();
+                break;
+            default;
+                $model = new Stwqresult();
+                break;
+        }
+        $resultModel = $model->where([['match_id', '=', $match_id]])->first();
+
+        return [
+            'order' => $Ordermodel,
+            'result' => $resultModel,
+        ];
+
+    }
 
 }

resources/lang/zh-cn/sportssoccer.php

@@ -24,6 +24,7 @@ return array(
     'date_search' => '日期查询',
     'match_status_search' => '赛事状态查询',
 
+    'odds_search' => '赔率查询',
     'p_code_search' => '父级赔率代码查询',
     'league_status_search' => '联赛状态查询',
     'odds_status_search' => '赔率状态查询',

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

@@ -129,6 +129,9 @@
 
     <style>
 
+        .layui-btn{
+             margin: 1px 0px;
+         }
         .log_title{
 
         }

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

@@ -121,6 +121,9 @@
     </div>
 
     <style>
+        .layui-btn{
+            margin: 1px 0px;
+        }
 
         .log_title{
 

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

@@ -308,6 +308,10 @@
 
     <style>
 
+        .layui-btn{
+            margin: 1px 0px;
+        }
+
         .log_title{
 
         }

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

@@ -142,6 +142,9 @@
     </div>
 
     <style>
+        .layui-btn{
+            margin: 1px 0px;
+        }
 
         .log_title{
 

resources/views/sports/base_odds.blade.php

@@ -37,9 +37,10 @@
             <form class="layui-form rewrite" eventType="eventForm"  action="" method="get">
                 <div class="layui-form-item">
                     <div class="layui-inline">
-                        <label class="layui-form-label">{{ trans('sportssoccer.match_id') }}</label>
+                        <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="{{ $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">
                         </div>
                         {{--<div class="layui-input-inline checkbox">--}}
                         {{--<input type="checkbox" name="sureblur" id="sureblur" lay-skin="switch" lay-text="精确|模糊" checked>--}}
@@ -82,7 +83,9 @@
                         <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 layui-btn-normal reset" data-type="reload" style="opacity: 1; pointer-events: auto;">重置</a>
-                        <a 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>
+                        <!-- <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"
+                           style="opacity: 1; pointer-events: auto;" href="javascript:window.location.reload()"><i class="layui-icon">ဂ</i></a>
                         @if(checkRriv('/admin/SportsBase/addodds'))<a href="/admin/SportsBase/addodds?{{ $id }}" class="layui-btn layui-btn-sm ">添加</a>@endif
                         @if(checkRriv('/admin/SportsBase/oddsdelete'))<a href="javascript:delWin('/admin/SportsBase/oddsdelete?id=');" class="layui-btn layui-btn-sm  layui-btn-danger">删除</a>@endif
                     </div>

resources/views/sports/basket_odds.blade.php

@@ -37,9 +37,10 @@
             <form class="layui-form rewrite" eventType="eventForm"  action="" method="get">
                 <div class="layui-form-item">
                     <div class="layui-inline">
-                        <label class="layui-form-label">{{ trans('sportssoccer.match_id') }}</label>
+                        <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="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">--}}
                         {{--<input type="checkbox" name="sureblur" id="sureblur" lay-skin="switch" lay-text="精确|模糊" checked>--}}
@@ -82,7 +83,9 @@
                         <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 layui-btn-normal reset" data-type="reload" style="opacity: 1; pointer-events: auto;">重置</a>
-                        <a 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>
+                        <!-- <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"
+                           style="opacity: 1; pointer-events: auto;" href="javascript:window.location.reload()"><i class="layui-icon">ဂ</i></a>
                         @if(checkRriv('/admin/SportsBasket/addodds'))<a href="/admin/SportsBasket/addodds?{{ $id }}" class="layui-btn layui-btn-sm ">添加</a>@endif
                         @if(checkRriv('/admin/SportsBasket/oddsdelete'))<a href="javascript:delWin('/admin/SportsBasket/oddsdelete?id=');" class="layui-btn layui-btn-sm  layui-btn-danger">删除</a>@endif
                     </div>

resources/views/sports/soccer_odds.blade.php

@@ -37,9 +37,9 @@
             <form class="layui-form rewrite" eventType="eventForm"  action="" method="get">
                 <div class="layui-form-item">
                     <div class="layui-inline">
-                        <label class="layui-form-label">{{ trans('sportssoccer.match_id') }}</label>
+                        <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">
                         </div>
                         {{--<div class="layui-input-inline checkbox">--}}
                             {{--<input type="checkbox" name="sureblur" id="sureblur" lay-skin="switch" lay-text="精确|模糊" checked>--}}
@@ -82,7 +82,9 @@
                         <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 layui-btn-normal reset" data-type="reload" style="opacity: 1; pointer-events: auto;">重置</a>
-                        <a 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>
+                        <!-- <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"
+                           style="opacity: 1; pointer-events: auto;" href="javascript:window.location.reload()"><i class="layui-icon">ဂ</i></a>
                         @if(checkRriv('/admin/SportsSoccer/addodds'))<a href="/admin/SportsSoccer/addodds?{{ $id }}" class="layui-btn layui-btn-sm ">添加</a>@endif
                         @if(checkRriv('/admin/SportsSoccer/oddsdelete'))<a href="javascript:delWin('/admin/SportsSoccer/oddsdelete?id=');" class="layui-btn layui-btn-sm  layui-btn-danger">删除</a>@endif
                     </div>

resources/views/sports/sports_notelist.blade.php

@@ -412,53 +412,66 @@
 
         // 设置结算比分
         function setScore_v2(order_id, match_id, game_code) {
+            $.getJSON("/admin/SoccerNoteList/manualmatchget_v2", {'order_id': order_id}, function (res) {
+                if (1 == res.status) {
+                    console.log(res);
+                    switch (game_code) {
+                        case 'zq':
+                            setScore_v2_zq(res.data.order, res.data.result,order_id, match_id, game_code);
+                            break;
+                        case 'lq':
+                            setScore_v2_lq(res.data.order, res.data.result,order_id, match_id, game_code);
+                            break;
+                        case 'bq':
+                            setScore_v2_bq(res.data.order, res.data.result,order_id, match_id, game_code);
+                            break;
+                        case 'wq':
+                            setScore_v2_wq(res.data.order, res.data.result,order_id, match_id, game_code);
+                            break;
+                    }
+                } else {
+                    layer.alert("数据拉取失败!", {title: '友情提示', icon: 2});
+                }
+            });
+        }
 
-            if (game_code != 'zq') {
-                layer.msg("暂时只支持 足球 手动单订单改结果!");
-                return false;
-            }
-
-            let content = '';
-            let content_zq = '<div style="width: 100%;height:25px;"></div><div class="layui-form-item">' +
+        function setScore_v2_zq(orderObj, resultObj,order_id,match_id,game_code) {
+            let content = '<div style="width: 100%;height:25px;"></div><div class="layui-form-item">' +
                 '  <div class="layui-inline">' +
+                '    <label class="layui-form-label">进球数:</label>' +
+                '    <label class="layui-form-label">上半场</label>' +
+                '    <div class="layui-input-inline" style="width: 50px;">' +
+                '      <input type="text" name="set_zq_home_score" id="set_zq_home_score_u" placeholder="主"  value="' + resultObj.u_home_score +'"  required   autocomplete="off" class="layui-input">' +
+                '    </div>' +
+                '    <div class="layui-form-mid"></div>' +
+                '    <div class="layui-input-inline" style="width: 50px;">' +
+                '      <input type="text" name="set_zq_guest_score"  id="set_zq_guest_score_u"  placeholder="客"  value="' + resultObj.u_guest_score +'"   required   autocomplete="off" class="layui-input">' +
+                '    </div>' +
                 '    <label class="layui-form-label">全场</label>' +
-                '    <div class="layui-input-inline" style="width: 100px;">' +
-                '      <input type="text" name="set_zq_home_score" id="set_zq_home_score" placeholder="主队得分"   required   autocomplete="off" class="layui-input">' +
+                '    <div class="layui-input-inline" style="width: 50px;">' +
+                '      <input type="text" name="set_zq_home_score" id="set_zq_home_score" placeholder="主"  value="' + resultObj.home_score +'"   required   autocomplete="off" class="layui-input">' +
                 '    </div>' +
                 '    <div class="layui-form-mid"></div>' +
-                '    <div class="layui-input-inline" style="width: 100px;">' +
-                '      <input type="text" name="set_zq_guest_score"  id="set_zq_guest_score"  placeholder="客队得分"   required   autocomplete="off" class="layui-input">' +
+                '    <div class="layui-input-inline" style="width: 50px;">' +
+                '      <input type="text" name="set_zq_guest_score"  id="set_zq_guest_score"  placeholder="客"   value="' + resultObj.guest_score +'"     required   autocomplete="off" class="layui-input">' +
                 '    </div>' +
                 '  </div>' +
                 '</div>';
 
-            let content_wq = '';
-            let content_bq = '';
-            let content_lq = '';
-            let matchdata = '';
-
-            if (game_code == 'zq') {
-                content = content_zq;
-            } else if (game_code == 'lq') {
-                content = content_lq;
-            } else if (game_code == 'bq') {
-                content = content_bq;
-            } else if (game_code == 'wq') {
-                content = content_wq;
-            }
             layer.open({
-                area: ['600px', '400px'], //宽高
+                area: ['600px', '250px'], //宽高
                 type: 1,
                 title: '设置比分',
                 content: content, //这里content是一个DOM，注意：最好该元素要存放在body最外层，否则可能被其它的相对元素所影响,
                 btn: ['提交', '取消'],
                 yes: function (index, layero) {
-                    if (game_code == 'zq') {
-                        matchdata = JSON.stringify({
+                 matchdata = JSON.stringify({
                             home: $("#set_zq_home_score").val(),
-                            guest: $("#set_zq_guest_score").val()
+                            guest: $("#set_zq_guest_score").val(),
+                            home_u: $("#set_zq_home_score_u").val(),
+                            guest_u: $("#set_zq_guest_score_u").val(),
                         });
-                    }
+
                     // 请求设置接口
                     $.ajax({
                         type: 'POST',
@@ -466,18 +479,16 @@
                         url: '/admin/SoccerNoteList/manualmatchpdate_v2',
                         data: {order_id: order_id, game_code: game_code, match_id: match_id, matchdata: matchdata},
                         success: function (res) {
-
                             if (1 == res.status) {
                                 layer.alert("设置成功", {title: '友情提示', icon: 1, closeBtn: 0}, function () {
                                     window.location.reload();
                                 });
                             } else {
-                                console.log(res);
-                                layer.alert("服务器异常1", {title: '友情提示', icon: 2});
+                                layer.alert("服务器异常(0)", {title: '友情提示', icon: 2});
                             }
                         },
                         error: function () {
-                            layer.alert("服务器异常2", {title: '友情提示', icon: 2});
+                            layer.alert("服务器异常(1)", {title: '友情提示', icon: 2});
                         }
                     })
 
@@ -485,7 +496,21 @@
                     return true;
                 },
             });
+        }
+
+        function setScore_v2_lq($orderObj, $resultObj) {
+            layer.msg('还未定怎么做，等等.....');
+            return ;
+        }
+
+        function setScore_v2_bq($orderObj, $resultObj) {
+            layer.msg('还未定怎么做，等等.....');
+            return ;
+        }
 
+        function setScore_v2_wq($orderObj, $resultObj) {
+            layer.msg('还未定怎么做，等等.....');
+            return ;
         }
 
 

resources/views/sports/tennis_odds.blade.php

@@ -37,9 +37,11 @@
             <form class="layui-form rewrite" eventType="eventForm"  action="" method="get">
                 <div class="layui-form-item">
                     <div class="layui-inline">
-                        <label class="layui-form-label">{{ trans('sportssoccer.match_id') }}</label>
+                        <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="{{ $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">
+
                         </div>
                         {{--<div class="layui-input-inline checkbox">--}}
                         {{--<input type="checkbox" name="sureblur" id="sureblur" lay-skin="switch" lay-text="精确|模糊" checked>--}}
@@ -82,7 +84,9 @@
                         <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 layui-btn-normal reset" data-type="reload" style="opacity: 1; pointer-events: auto;">重置</a>
-                        <a 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>
+                        <!-- <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"
+                           style="opacity: 1; pointer-events: auto;" href="javascript:window.location.reload()"><i class="layui-icon">ဂ</i></a>
                         @if(checkRriv('/admin/SportsTennis/addodds'))<a href="/admin/SportsTennis/addodds?{{ $id }}" class="layui-btn layui-btn-sm ">添加</a>@endif
                         @if(checkRriv('/admin/SportsTennis/oddsdelete'))<a href="javascript:delWin('/admin/SportsTennis/oddsdelete?id=');" class="layui-btn layui-btn-sm  layui-btn-danger">删除</a>@endif
                     </div>