追加胜负规则验证滚球危险球

app/Http/Controllers/Admin/SoccerNoteListController.php

@@ -367,28 +367,64 @@ class SoccerNoteListController extends Controller
     /**
      *单式注单重新结算
      */
+    // public function resettlement(Req $req) {
+    //     $id = $req->id;
+    //     if (intval($id) < 1) {
+    //         return -1;
+    //     }
+    //     $order = \App\Models\SportsNoteList::where('id',$id)->first();
+    //     $match_id = $order->match_id;
+    //     $game_code = $order->game_code;
+    //     $order_id = $order->order_id;
+    //     $order_ids = array($order->order_id);
+    //     //return $match_id;
+    //     $bet_type = 1;//单式注单
+    //     //重新判断输赢
+    //     $settlementWinFail = new SettlementWinFail();
+    //     $res = $settlementWinFail->ProcWinInfoByOneOrder($match_id, $order_id, $bet_type);
+    //     //结算
+    //     $SettlementOrder = new SettlementOrder();
+    //     $settype = 2; //重新结算
+    //     $data = $SettlementOrder->reSettlement($order_ids,$bet_type,$settype,$game_code,$match_id,$match_status=0);
+    //     return $data;
+    // }
     public function resettlement(Req $req) {
-        $id = $req->id;
-        if (intval($id) < 1) {
-            return -1;
+        $order_id = $req->order_id;
+        $type = $req->type;
+        $match_id = $req->match_id;
+        $jsurl = config('sconstant.url');//结算请求域名地址
+        $token = session('adminInfo.token');
+        //查询是否有订单
+        $newapp = new \App\Models\SportsNoteList();
+        $simplexnum = $newapp->onlyorder($order_id);
+        if($simplexnum==1){
+            $requet = file_get_contents($jsurl."/DoWinFailOneOrder?order_id=".$order_id."&token=".$token);
+            if(json_decode($requet,true)['status']==1){
+                $napp = new \App\Models\Stzqresult();
+                $simplex = array(
+                    'token'=>$token,  
+                    'order_ids'=>$order_id, //订单id字符串，用半角都好分隔
+                    'bettype'=>1, //结算类型  1单式  2串式 
+                    'settype'=>2, //结算次数  1首次  2非首冷饮
+                    'game_code'=>$type, //赛事类型  zq lq wq bq
+                    'match_id'=>$match_id, // 赛事ID
+                    'change_status'=>0   //是否改状态
+                );
+                $url=$jsurl.'/Settelement';
+                $simplex_res = $napp->post_curls($url,$simplex);//返回json
+                $huawei_res = json_decode($simplex_res,true);
+                if($huawei_res['status']==1){
+                    return json_encode(['status'=>1,'msg'=>'结算成功']);
+                }else{
+                    return json_encode(['status'=>4,'msg'=>'结算失败']);
+                }
+            }else{
+                return json_encode(['status'=>3,'msg'=>'输赢判断错误']);
+            } 
+        }else{
+            return json_encode(['status'=>2,'msg'=>'订单不存在']);
         }
-        $order = \App\Models\SportsNoteList::where('id',$id)->first();
-        $match_id = $order->match_id;
-        $game_code = $order->game_code;
-        $order_id = $order->order_id;
-        $order_ids = array($order->order_id);
-        //return $match_id;
-        $bet_type = 1;//单式注单
-        //重新判断输赢
-        $settlementWinFail = new SettlementWinFail();
-        $res = $settlementWinFail->ProcWinInfoByOneOrder($match_id, $order_id, $bet_type);
-        //结算
-        $SettlementOrder = new SettlementOrder();
-        $settype = 2; //重新结算
-        $data = $SettlementOrder->reSettlement($order_ids,$bet_type,$settype,$game_code,$match_id,$match_status=0);
-        return $data;
     }
-
     /**
      *单式注单批量结算
      */

app/Http/Controllers/Admin/SportsfootController.php

@@ -82,7 +82,19 @@ class SportsfootController extends Controller {
 		$match_id = $req->match_id;
 		$warn = \App\Models\Stzqresult::where('match_id', $match_id)->select("warn_more")->first();
 		$request['warnmore'] = json_decode($warn['warn_more'],true);
+		// $sousuo = $req->sousuo;
+		// if($sousuo){
+		// 	for ($i=0; $i < count($request['warnmore']); $i++) { 
+		// 	    if($request['warnmore'][$i]['rtype']==$sousuo){
+		// 	        $array[$i]['timei'] = $request['warnmore'][$i]['timei'];
+		// 	        $array[$i]['rtype'] = $request['warnmore'][$i]['rtype'];
+		// 	    }
+		// 	    // unset($array2D[2]);//删除
+		// 	}
+		// 	$request['warnmore'] = $array;
+		// }
 		$request['match_id'] = $match_id;
+
 		// return
 		return view('admin.sportsfoot/addwarn', $request);
 	}
@@ -102,7 +114,7 @@ class SportsfootController extends Controller {
 		$timei = $req->timei?$req->timei:"1970-11-1 0:0:1";
 		$rtype = $req->warntype?$req->warntype:0;
 		$typenum = $req->typenum;
-		$model = \App\Models\Stzqresult::where('match_id', $matchid)->select("warn_more")->first()->toArray();
+		$model = \App\Models\Stzqresult::where('match_id', $matchid)->select("warn_more","start_time")->first()->toArray();
 		$sel = json_decode($model['warn_more'],true);
 		$addru = array(
 			array(
@@ -110,23 +122,30 @@ class SportsfootController extends Controller {
 	        	'rtype'=>$rtype,
 	        ),
         );
-
-		if($typenum==1){
-			if($sel[0]['rtype']==0){
-				//首次添加
-				$res = \App\Models\Stzqresult::where ('match_id', $matchid)->update(['warn_more' => json_encode($addru)]);
+		$only =$model['start_time'];
+		$t = strtotime($only);
+		$tt = date('Y-m-d H:i:s', $t+1*3*60*60);
+		
+		if($only<$timei && $timei<$tt){
+			if($typenum==10000){
+				if($sel[0]['rtype']==0){
+					//首次添加
+					$res = \App\Models\Stzqresult::where ('match_id', $matchid)->update(['warn_more' => json_encode($addru)]);
+				}else{
+					//再次添加
+					$upnum = array_merge_recursive($sel,$addru);
+					$res = \App\Models\Stzqresult::where ('match_id', $matchid)->update(['warn_more' => json_encode($upnum)]);
+				}
 			}else{
-				//再次添加
-				$upnum = array_merge_recursive($sel,$addru);
-				$res = \App\Models\Stzqresult::where ('match_id', $matchid)->update(['warn_more' => json_encode($upnum)]);
+				//编辑
+				for ($i=0; $i < count($sel); $i++) { 
+					$sel[$wid]['timei'] = $timei;
+					$sel[$wid]['rtype'] = $rtype;
+				}
+				$res = \App\Models\Stzqresult::where ('match_id', $matchid)->update(['warn_more' => json_encode($sel)]);
 			}
 		}else{
-			//编辑
-			for ($i=0; $i < count($sel); $i++) { 
-				$sel[$wid]['timei'] = $timei;
-				$sel[$wid]['rtype'] = $rtype;
-			}
-			$res = \App\Models\Stzqresult::where ('match_id', $matchid)->update(['warn_more' => json_encode($sel)]);
+			return json_encode(['status'=>2,'msg'=>'请设置正确时间']);
 		}
 		
 		return responseToJson(1);

app/Lib/Biz/Sport/Common.php

@@ -1140,7 +1140,7 @@ class Common {
      * $bet_match 投注赛事数据
      * $result_match_r 投注赛事结果记录
      */
-    static function WARN_CHECK($bet_match='',$result_match_r=[]){
+    static function WARN_CHECK($bet_match='',$result_match=[]){
         /*
         危险球定义：
             1.角球  
@@ -1152,25 +1152,22 @@ class Common {
         危险球审核时间：
             下注成功后60~90秒
         */
-        if(!empty($bet_match) and !empty($result_match_r)) {
+        if(!empty($bet_match) and !empty($result_match)) {
             //获取投注时间  时间戳
             $bet_time = strtotime($bet_match->ctime);
             //取出所有有危险球的数据
-            foreach($result_match_r as $k=>$v){
-                //如果有危险球数据
-                if(!empty($v['warn_more'])){
-                    //json转数组
-                    $warn_more = json_encode($v['warn_more']);
-                    //出现危险球的时间
-                    $warn_time = strtotime($warn_more['time']);
-                    //如果出现危险球的时间不大于投注时间 90秒 则投注无效
-                    if(($warn_time - $bet_time) < 90){
-                        $data=[
-                            'code'=>-1,
-                            'warn_more'=>$warn_more
-                        ];
-                        return $data;
-                    }
+            $warn_more = $result_match[0]->warn_more;
+            //json转数组
+            $warn_more = json_decode($warn_more,true);
+            foreach($warn_more as $k=>$v){
+                //获取危险球出现时间 转时间戳
+                $warn_time = strtotime($v['timei']);
+                if(($warn_time - $bet_time) < 90){
+                    $data=[
+                        'code'=>-1,
+                        'warn_more'=>$v
+                    ];
+                    return $data;
                 }
             }
             $data = [

app/Models/SportsNoteList.php

@@ -460,4 +460,10 @@ class SportsNoteList extends BaseModel {
         return $data->toArray();
     }
 
+    //查询单订单是否存在
+    function onlyorder($orderid){
+        $order = $this->where('order_id', $orderid)->count();
+        return $order;
+    }
+
 }

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

@@ -103,51 +103,38 @@
 		<div class="layui-col-xs12">
 			<div class="layui-form-item">
 				<div class="layui-inline">
-					<!-- <label class="layui-form-label">搜&nbsp;&nbsp;索 </label>
-					<div class="layui-input-inline">
-						<input type="text" name="group_name" id="form_group_name" lay-verify="" autocomplete="off" class="layui-input">
-					</div>
+    				<!-- <label class="layui-form-label">搜&nbsp;&nbsp;索 </label>
+                    <input type="hidden" id="match_id" name="match_id" value="{{$match_id}}">
+    				<div class="layui-input-inline">
+    					<input type="text" name="sousuo" id="sousuo" lay-verify="" autocomplete="off" class="layui-input" value="">
+    				</div>
 
-					<div class="layui-inline">
-						<a class="layui-btn layui-btn-sm lay-btn-diy"   data-type="reload" style="opacity: 1; pointer-events: auto;">提交</a>
-					</div> -->
-
-					<div class="layui-inline"><button onclick="addResult({{$match_id}},0,1)" class="layui-btn layui-btn-sm layui-btn-green set">添加</button></div>
+    				<div class="layui-inline">
+                        <button class="layui-btn layui-btn-sm lay-btn-diy" data-type="reload" style="opacity: 1; pointer-events: auto;" onclick="soulist()">提交</button>
+    				</div> -->
+                    
+					<div class="layui-inline" style="margin-left:20px;"><button onclick="addResult({{$match_id}},'',10000)" class="layui-btn layui-btn-sm layui-btn-green set">添加</button></div>
 				</div>
 			</div>
 		</div>
 	</div>
 	
-	<div class="layui-form-item">
-		<div class="layui-inline">
-			<label class="layui-form-label" style="left:100px;">时 间</label>
-			<label class="layui-form-label" style="left:300px;">类 型</label>
-			<label class="layui-form-label" style="left:470px;">操 作</label>
-		</div>
-	</div>
-    
-    @foreach ($warnmore as $k=>$val)
-	<div class="layui-form-item">
-		<div class="layui-inline">
-			<label class="layui-form-label"></label>
-			<div class="layui-input-inline">
-				<input type="text" class="layui-input" value="{{$warnmore[$k]['timei']}}" readonly="readonly">
-			</div>
-		</div>
-		<div class="layui-inline">
-			<label class="layui-form-label"></label>
-			<div class="layui-input-inline">
-				<input type="text" class="layui-input" value="{{$warnmore[$k]['rtype']}}" readonly="readonly">
-			</div>
-		</div>
-		<div class="layui-inline">
-			<label class="layui-form-label"></label>
-			<div class="layui-input-inline">
-				<button onclick="addResult({{$match_id}},{{$k}},2)" class="layui-btn layui-btn-sm layui-btn-green set">编辑</button>
-			</div>
-		</div>
-	</div>
-    @endforeach
+    <table lay-filter="parse-table-demo">
+        <tr class="layui-form-item">
+            <td class="layui-form-label" style="width:150px;left:10px;">时 间</td>
+            <td class="layui-form-label" style="width:100px;left:10px;">类 型</td>
+            <td class="layui-form-label" style="width:100px;left:10px;">操 作</td>
+        </tr>
+        @foreach ($warnmore as $k=>$val)
+        <tr class="layui-form-item">
+            <td class="layui-form-label" style="width:150px;left:10px;">{{$warnmore[$k]['timei']}}</td>
+            <td class="layui-form-label" style="width:100px;left:10px;">{{$warnmore[$k]['rtype']}}</td>
+            <td class="layui-form-label" style="width:100px;left:10px;">
+                <button onclick="addResult({{$match_id}},{{$k}},2)" class="layui-btn layui-btn-sm layui-btn-green set">编辑</button>
+            </td>
+        </tr>
+        @endforeach
+    </table>
 
 	<!-- 弹窗 -->
 	<div id="myModal" class="modal">
@@ -181,7 +168,7 @@
     <script>
     	function addResult(match_id,wid,typenum){
             $(":input",$("#myModal")).each(function(i){  $(this).val('');});
-            var wid = wid;
+            var wid = wid?wid:0;
             document.getElementById("matchid").value=match_id;//赋值个弹窗
             document.getElementById("wid").value=wid;//赋值个弹窗
             document.getElementById("typenum").value=typenum;//赋值个弹窗
@@ -252,13 +239,30 @@
                 url: '/admin/Sportsfoot/addwarnonly',
                 data: {matchid:matchid,timei:timei,warntype:warntype,wid:wid,typenum:typenum},
                 success: function(data) {
-                    // alert(data);
-                    layer.msg(data.msg);
-                    location. reload()//刷新当前页面
-                                
+                    if(data.status==1){
+                        layer.msg(data.msg);
+                        location. reload()//刷新当前页面
+                    }else{
+                        layer.msg(data.msg);return;
+                    }
                 }
             })
         }
+        //搜索
+        // function soulist(){
+        //     var sousuo = $("#sousuo").val();
+        //     var match_id = $("#match_id").val();
+            
+        //     $.ajax({
+        //         type: 'POST',
+        //         dataType: 'json',
+        //         url: '/admin/Sportsfoot/addwarn',
+        //         data: {match_id:match_id,sousuo:sousuo},
+        //         success: function(data) {
+        //             location. reload()//刷新当前页面           
+        //         }
+        //     })
+        // }
 
     </script>
 

resources/views/sports/sports_notelist.blade.php

@@ -177,12 +177,12 @@
         @{{#} }}
         
         @{{#if(d.match_status==2 || d.match_status==3 || d.match_status==5){ }} 
-            <a href="/admin/SoccerNoteList/resettlement/?id=@{{d.id}}" class="layui-btn layui-btn-sm settlement">再结算</a>
+            <button onclick="resettlement('@{{d.order_id}}','{{$type}}','@{{d.match_id}}')" class="layui-btn layui-btn-sm settlement">再结算</button>
         @{{#} }}
         @{{#if(d.match_status==1){ }} 
-            <a href="/admin/SoccerNoteList/resettlement/?id=@{{d.id}}" class="layui-btn layui-btn-sm settlement">结算</a>
+            <button onclick="resettlement('@{{d.order_id}}','{{$type}}','@{{d.match_id}}')" class="layui-btn layui-btn-sm settlement">结算</button>
         @{{#} }}
-
+        
     </script>
 
     <script type="text/html" id="status">
@@ -617,24 +617,47 @@
             });
 
         }
-        //重新结算
-        function resettlement(url) {
-            layer.confirm('是否确认重新结算？', {
-                btn: ['确认', '取消'] //按钮
-            }, function() {
-                $.getJSON(url, function(data, textStatus) {
-                    //console.log(data);
-                    if (data.status == '1') {
-                        reloadDataTable();
-                        layer.msg('重新结算成功');
-                    } else {
+        //结算
+        // function resettlement(url) {
+        //     layer.confirm('是否确认重新结算？', {
+        //         btn: ['确认', '取消'] //按钮
+        //     }, function() {
+        //         $.getJSON(url, function(data, textStatus) {
+        //             //console.log(data);
+        //             if (data.status == '1') {
+        //                 reloadDataTable();
+        //                 layer.msg('重新结算成功');
+        //             } else {
+        //                 layer.msg(data.msg);
+        //             }
+        //         });
+        //     }, function() {
+
+        //     });
+
+        // }
+        function resettlement(order_id,type,match_id) {
+            $.ajax({
+                type: 'POST',
+                dataType: 'json',
+                url: '/admin/SoccerNoteList/resettlement',
+                data: {order_id:order_id,type:type,match_id:match_id},
+                success: function(data) {
+                    if(data.status==1){
+                        layer.msg(data.msg);
+                        location. reload()//刷新当前页面
+                    }else if(data.status==2){
+                        layer.msg(data.msg);
+                        reloadDataTable();return;
+                    }else if(data.status==3){
                         layer.msg(data.msg);
+                        reloadDataTable();return;
+                    }else{
+                        layer.msg(data.msg);
+                        reloadDataTable();return;
                     }
-                });
-            }, function() {
-
-            });
-
+                }
+            })
         }
 
         //单式注单作废