异常处理

app/Http/Controllers/Admin/SoccerNoteListController.php

@@ -1072,6 +1072,7 @@ class SoccerNoteListController extends Controller
 
             if ($ret) {
                 $ret2 = $this->do_win_set($order_id, $game_code, $match_id);
+
                 if ($ret2['status'] == 1) {
                     return responseToJson(1, '操作成功!');
                 } else {
@@ -1226,6 +1227,7 @@ class SoccerNoteListController extends Controller
             'token' => session('adminInfo.token'),    //外网
             'order_id' => $order_id,
         ];
+    
         $ret = $this->request_post(config('sconstant.url') . '/DoWinFailOneOrder', $data);
         return json_decode($ret, true);
     }

app/Http/Controllers/Admin/SportsfootController.php

@@ -31,15 +31,67 @@ class SportsfootController extends Controller {
 		$simplex_ids = array_column($newapp->allsimplexorder($match_id,'zq'),'order_id');
 		$str_ids = array_column($newapp->allstrorder($match_id),'order_id');
 
+//		//判断赛事下注单输赢
+//		$datas = array('noticeid' => $noticeid , 'token' => $token);
+//		$settlementAuto = new \App\Lib\Settlement\SettlementAuto();
+//		$winfail = $settlementAuto->SubmitSettelement('w',$datas);
+//		if($winfail == false){
+//			return json_encode(['status'=>2,'msg'=>'判断输赢错误,请联系管理员!!!']);//输赢错误
+//		}
+//		$sim = array(
+//			'token'=>$token,
+//			'order_ids'=>$simplex_ids, //订单id字符串，用半角都好分隔
+//			'bettype'=>1, //结算类型  1单式  2串式
+//			'settype'=>2, //结算次数  1首次  2非首冷饮
+//			'game_code'=>$type, //赛事类型  zq lq wq bq
+//			'match_id'=>$match_id,  // 赛事ID
+//			'change_status'=>1  //是否改状态
+//		);
+//		$str = array(
+//			'token'=>$token,
+//			'order_ids'=>$str_ids, //订单id字符串，用半角都好分隔
+//			'bettype'=>2, //结算类型  1单式  2串式
+//			'settype'=>2, //结算次数  1首次  2非首冷饮
+//			'game_code'=>$type, //赛事类型  zq lq wq bq
+//			'match_id'=>$match_id,  // 赛事ID
+//			'change_status'=>1  //是否改状态
+//		);
+//		if(count($simplex_ids)>0 || count($str_ids)>0){
+//			//单式结算
+//			if(count($simplex_ids)>0){
+//				$sim['order_ids'] = json_encode($simplex_ids);
+//				$settlesim = $settlementAuto->SubmitSettelement('s',$sim);
+//				if($settlesim == false){
+//					return json_encode(['status'=>3,'msg'=>'单式注单结算有误,请联系管理员!!!']);
+//				}
+//			}
+//			if(count($str_ids)>0){
+//				$str['order_ids'] = json_encode($str_ids);
+//				$settlestr = $settlementAuto->SubmitSettelement('s',$str);
+//				if($settlestr == false){
+//					return json_encode(['status'=>3,'msg'=>'串式注单结算有误,请联系管理员!!!']);
+//				}
+//			}
+//			return json_encode(['status'=>1,'msg'=>'结算成功']);
+//		}else{
+//			$log = array(
+//				session('adminInfo.admin_name'),
+//			);
+//			OperationLog(session('adminInfo.admin_id'), '足球结算', $log);
+//			$res = \App\Models\Stzqresult::where ('match_id', $match_id)->update(['status' =>3]);
+//			$res = \App\Models\SportsSoccer::where ('id', $match_id)->update(['status' =>3]);
+//            return json_encode(['status'=>4,'msg'=>'该赛事没有任何订单,将会结束该赛事!!!']);
+//		}
+
 		if(count($simplex_ids)>0 || count($str_ids)>0){
 			$requet = file_get_contents($jsurl."/WinFail?noticeid=".$noticeid."&token=".$token);
-			
+
 			if(json_decode($requet,true)['status']==1){
 				$napp = new \App\Models\Stzqresult();
 				//单式结算
 				if(count($simplex_ids)>0 && count($str_ids)==0){
 					$huawei_res = $napp->simplexs($token,$match_id,$jsurl,'zq');
-					
+
 					if($huawei_res['status']==1){
 						return json_encode(['status'=>1,'msg'=>'单式结算成功,没有串式订单']);
 					}else{
@@ -61,11 +113,11 @@ class SportsfootController extends Controller {
 					//串式结算
 					$tandem_res = $napp->tandems($token,$match_id,$jsurl,'zq');
 					if($tandem_res['status']==1 && $huawei_res['status']==1){
-						return json_encode(['status'=>1,'msg'=>'结算成功']); 
+						return json_encode(['status'=>1,'msg'=>'结算成功']);
 					}elseif($tandem_res['status']!=1 || $huawei_res['status']!=1){
 						return json_encode(['status'=>3,'msg'=>'结算有误,请联系管理员!!!('.$tandem_res['msg'].$huawei_res['msg'].')']);
 					}else{
-						return json_encode(['status'=>3,'msg'=>'返回参数不对']); 
+						return json_encode(['status'=>3,'msg'=>'返回参数不对']);
 					}
 				}
 			}else{
@@ -78,7 +130,7 @@ class SportsfootController extends Controller {
 			OperationLog(session('adminInfo.admin_id'), '足球结算', $log);
 			$res = \App\Models\Stzqresult::where ('match_id', $match_id)->update(['status' =>3]);
 			$res = \App\Models\SportsSoccer::where ('match_id', $match_id)->update(['status' =>3]);
-            return json_encode(['status'=>4,'msg'=>'该赛事没有任何订单,将会结束该赛事!!!']);
+			return json_encode(['status'=>4,'msg'=>'该赛事没有任何订单,将会结束该赛事!!!']);
 		}
 		
 	}

app/Http/Model/StLqResult.php

@@ -337,6 +337,38 @@ class StLqResult extends Model
                     '3'=>$mark_result['sc_3th_C'],
                     '4'=>$mark_result['sc_4th_C'],
                 ];
+                //拼接赛事主客队比分
+                $inning = [
+                    1=>[
+                        "home"=>$mark_result['sc_1th_H'],
+                        "guest"=>$mark_result['sc_1th_C'],
+                    ],
+                    2=>[
+                        "home"=>$mark_result['sc_2th_H'],
+                        "guest"=>$mark_result['sc_2th_C'],
+                    ],
+                    3=>[
+                        "home"=>$mark_result['sc_3th_H'],
+                        "guest"=>$mark_result['sc_3th_C'],
+                    ],
+                    4=>[
+                        "home"=>$mark_result['sc_4th_H'],
+                        "guest"=>$mark_result['sc_4th_C'],
+                    ],
+                    5=>[
+                        "home"=>$mark_result['sc_1th_H']+$mark_result['sc_2th_H'],
+                        "guest"=>$mark_result['sc_1th_C']+$mark_result['sc_2th_C'],
+                    ],
+                    6=>[
+                        "home"=>$mark_result['sc_3th_H']+$mark_result['sc_4th_H'],
+                        "guest"=>$mark_result['sc_3th_C']+$mark_result['sc_4th_C'],
+                    ],
+                    'all'=>[
+                        "home"=>$mark_result['sc_1th_H']+$mark_result['sc_2th_H']+$mark_result['sc_3th_H']+$mark_result['sc_4th_H'],
+                        "guest"=>$mark_result['sc_1th_C']+$mark_result['sc_2th_C']+$mark_result['sc_3th_C']+$mark_result['sc_4th_C'],
+                    ],
+
+                ];
                 //赛事待写入赛果数据
                 $set_match_r = [
                     "match_id"=> $v->match_id,
@@ -347,6 +379,7 @@ class StLqResult extends Model
                     "guest_rate"=> $v->guest_rate?:0, //客队让球
                     "home_score"=> json_encode($home_score)?:'', //主队进球数
                     "guest_score"=> json_encode($guest_score)?:'', //客队进球数
+                    "inning"=> json_encode($inning)?:'', //主客队进球数
                     "all_goal"=> $all_goal?:0, //总进球数
                     // "first_score"=> $result_4['first_score']?:'', //最先进球球队
                     // "last_score"=> $result_4['last_score']?:'', //最后进球球队

app/Http/Model/StWqResult.php

@@ -195,6 +195,10 @@ class StWqResult extends Model
                             "home"=>$result_mark['sc_5th_H'],
                             "guest"=>$result_mark['sc_5th_C'],
                         ],
+                        'all'=>[
+                            "home"=>$result_mark['sc_1th_H']+$result_mark['sc_2th_H']+$result_mark['sc_3th_H']+$result_mark['sc_4th_H']+$result_mark['sc_5th_H'],
+                            "guest"=>$result_mark['sc_1th_C']+$result_mark['sc_2th_C']+$result_mark['sc_3th_C']+$result_mark['sc_4th_C']+$result_mark['sc_5th_C'],
+                        ],
                     
                     ];
 
@@ -366,6 +370,10 @@ class StWqResult extends Model
                             "home"=>$result_mark['sc_5th_H'],
                             "guest"=>$result_mark['sc_5th_C'],
                         ],
+                        'all'=>[
+                            "home"=>$result_mark['sc_1th_H']+$result_mark['sc_2th_H']+$result_mark['sc_3th_H']+$result_mark['sc_4th_H']+$result_mark['sc_5th_H'],
+                            "guest"=>$result_mark['sc_1th_C']+$result_mark['sc_2th_C']+$result_mark['sc_3th_C']+$result_mark['sc_4th_C']+$result_mark['sc_5th_C'],
+                        ],
                     
                     ];
 

app/Lib/Biz/Sport/Common.php

@@ -1407,6 +1407,7 @@ class Common
             $oddsData_str = $oddsData_str['invalid'];
 		}
 
+        //修改赛事结果后注单状态修改为未结算
         $upapp = new \App\Models\SportsNoteList();
         $upapp->settleorder($match_id,$oddsData_sim_settle,$oddsData_str_settle,$game_code);
 

app/Models/MoneyBuyMatch.php

@@ -66,9 +66,9 @@ class MoneyBuyMatch extends Model
         }
         if(empty($select)){
             $select = ['money_buy_str.order_id'];
-            $data = $this->join('money_buy_str', 'money_buy_match.batch_id', '=', 'money_buy_str.batch_id')->select($select)->where($where)->distinct('money_buy_match.batch_id')->get()->toArray();
+            $data = $this->join('money_buy_str', 'money_buy_match.order_id', '=', 'money_buy_str.order_id')->select($select)->where($where)->distinct('money_buy_match.order_id')->get()->toArray();
         }else{
-            $data = $this->join('money_buy_str', 'money_buy_match.batch_id', '=', 'money_buy_str.batch_id')->join('st_odds_code', 'money_buy_match.odds_code', '=', 'st_odds_code.odds_code')->select($select)->where($where)->distinct('money_buy_match.batch_id')->get();
+            $data = $this->join('money_buy_str', 'money_buy_match.order_id', '=', 'money_buy_str.order_id')->join('st_odds_code', 'money_buy_match.odds_code', '=', 'st_odds_code.odds_code')->select($select)->where($where)->distinct('money_buy_match.order_id')->get();
         }
         return $data;
     }

app/Models/SportsNoteList.php

@@ -1415,6 +1415,16 @@ class SportsNoteList extends BaseModel
             if( !$v )
                 unset( $orders[$k] );
         }
+        //数组去重
+        foreach( $orders as $k=>$v){
+            $order = $orders;
+            unset( $order[$k] );
+            foreach( $order as $kk=>$vv){
+                if( $v['order_id'] ==  $vv['order_id'])
+                    unset( $orders[$k] );
+            }
+        }
+        //print_r($orders);exit;
 
         $order_ids = array();
         if(!empty($orders)){
@@ -1465,7 +1475,7 @@ class SportsNoteList extends BaseModel
                     }
                 }
             }
-            //print_r($orders);exit;
+//            print_r($orders);exit;
             foreach($orders as $k=>$v){
                 $models = new \App\Models\Money_details();
                 $models->info_identity = UUID();
@@ -1501,7 +1511,7 @@ class SportsNoteList extends BaseModel
                         DB::beginTransaction();//开启事务
                         $this->where('order_id', $v['order_id'])->update(['status' => '1','settle_status' => '1','game_status' => '0','game_status' => '0']);//'use_mark'=>'通过设置赛事比分作废'
                         \App\Models\MoneyBuyStr::where('order_id', $v['order_id'])->update(['status' => '1','settle_status' => '1','game_status' => '0','game_status' => '0']);
-                        \App\Models\MoneyBuyMatch::where('batch_id', $v['batch_id'])->where('match_id', $matchid)->update(['result' => 0, 'status' => 0]);
+                        \App\Models\MoneyBuyMatch::where('order_id', $v['order_id'])->where('match_id', $matchid)->update(['result' => 0, 'status' => 0]);
                         \App\Models\Account_detailed::where('account_identity', $v['account_identity'])->update(['available_cash' => $v['available_cash'], 'cash' => $v['available_cash']]);
                         $models->save();
 
@@ -1512,7 +1522,7 @@ class SportsNoteList extends BaseModel
                 }else{
                     $this->where('order_id', $v['order_id'])->update(['status' => '1','settle_status' => '1','game_status' => '0']);
                     \App\Models\MoneyBuyStr::where('order_id', $v['order_id'])->update(['status' => '1','settle_status' => '1','game_status' => '0']);
-                    \App\Models\MoneyBuyMatch::where('batch_id', $v['batch_id'])->where('match_id', $matchid)->update(['result' => 0, 'status' => 0]);
+                    \App\Models\MoneyBuyMatch::where('order_id', $v['order_id'])->where('match_id', $matchid)->update(['result' => 0, 'status' => 0]);
                 }
             }
         }

public/js/common.js

@@ -108,7 +108,6 @@ function delWin(url, ids) {
  */
 function allbalance(url, ids) {
     ids = (ids == undefined || ids == '') ? g.currentDataTableIds : ids;
-    // console.log(1111);
     if (ids == '' || ids == undefined) {
         layer.msg('请先选择数据');
         return;

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

@@ -125,9 +125,9 @@
                         <a class="layui-btn layui-btn-sm layui-btn-green" data-type="reload" onclick="refreshall('wq')" style="opacity: 1; pointer-events: auto;">刷新赛事</a>
                         <!--@if(checkRriv('/admin/sportsbk/addoutcome'))<a href="/admin/sportsbk/addoutcome" class="layui-btn layui-btn-sm ">添加</a>@endif-->
                         @if(checkRriv('/admin/sportsbk/deleteoutcome'))<a href="javascript:delWin('/admin/sportsbk/deleteoutcome?id=');" class="layui-btn layui-btn-sm  layui-btn-danger">删除</a>@endif
-                        @if(checkRriv('/admin/sportsbk/Settlement'))<a href="javascript:allbalance('/admin/sportsbk/Settlement?allhalf=1&id=');" class="layui-btn layui-btn-sm set">结算全场</a>@endif
-                        @if(checkRriv('/admin/sportsbk/Settlement'))<a href="javascript:allbalance('/admin/sportsbk/Settlement?allhalf=2&id=');" class="layui-btn layui-btn-sm">结算上半场</a>@endif
-                        @if(checkRriv('/admin/sportsbk/Settlement'))<a href="javascript:allbalance('/admin/sportsbk/Settlement?allhalf=2&id=');" class="layui-btn layui-btn-sm set">重新结算上半场</a>@endif
+                        @if(checkRriv('/admin/sportsbk/Settlement'))<a href="javascript:allbalance('/admin/sportswq/Settlement?allhalf=1&id=');" class="layui-btn layui-btn-sm set">结算全场</a>@endif
+                        @if(checkRriv('/admin/sportsbk/Settlement'))<a href="javascript:allbalance('/admin/sportswq/Settlement?allhalf=2&id=');" class="layui-btn layui-btn-sm">结算上半场</a>@endif
+                        @if(checkRriv('/admin/sportsbk/Settlement'))<a href="javascript:allbalance('/admin/sportswq/Settlement?allhalf=2&id=');" class="layui-btn layui-btn-sm set">重新结算上半场</a>@endif
                     </div>
                 </div>
             </form>

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

@@ -548,6 +548,73 @@
             layer.close(resultLogOpen)
         }
 
+
+        //篮球作废
+        function lqrevoke(match_id){
+            var match_id = match_id;
+            $.ajax({
+                type: 'POST',
+                dataType: 'json',
+                url: '/admin/Sportsbk/revoke',
+                data: {match_id:match_id},
+                success: function(data) {
+                    if(data.status==1){
+                        layer.msg(data.msg);
+                        location. reload()//刷新当前页面
+                    }
+                }
+            })
+        }
+
+        //篮球结算
+        function lqsettlement(match_id,type){
+            var match_id = match_id;
+            var type = type;
+
+            $.ajax({
+                type: 'POST',
+                dataType: 'json',
+                url: '/admin/Sportsbk/Settlementlq',
+                data: {match_id:match_id,type:type},
+                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==4){
+                        layer.msg(data.msg);
+                        reloadDataTable();return;
+                    }else{
+                        layer.msg(data.msg);
+                        reloadDataTable();return;
+                    }
+                }
+            })
+        }
+
+
+        //刷新赛事数据
+        function refreshall(game_code){
+            var game_code = game_code;
+            $.ajax({
+                type: 'POST',
+                dataType: 'json',
+                url: '/setSports',
+                data: {game_code:game_code},
+                success: function(data) {
+                    // alert(data);
+                    if(data.status==1){
+                        if(data.msg){
+                            layer.msg(data.msg);
+                        }
+                        location. reload()//刷新当前页面
+                    }
+                }
+            })
+        }
+
 	</script>
 @push('dataTableJS')
 /*var active = {

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

@@ -146,9 +146,9 @@
                         <a class="layui-btn layui-btn-sm layui-btn-green" data-type="reload" onclick="refreshall('zq')" style="opacity: 1; pointer-events: auto;">刷新赛事</a>
                         <!-- @if(checkRriv('/admin/sportsfoot/addoutcome'))<a href="/admin/sportsfoot/addoutcome" class="layui-btn layui-btn-sm ">添加</a>@endif -->
                         @if(checkRriv('/admin/sportsfoot/deleteoutcome'))<a href="javascript:delWin('/admin/sportsfoot/deleteoutcome?id=');" class="layui-btn layui-btn-sm  layui-btn-danger">删除</a>@endif
-                        @if(checkRriv('/admin/sportsfoot/Settlement'))<a href="javascript:allbalance('/admin/sportsfoot/Settlement?allhalf=1&id=');" class="layui-btn layui-btn-sm set">结算全场</a>@endif
-                        @if(checkRriv('/admin/sportsfoot/Settlement'))<a href="javascript:allbalance('/admin/sportsfoot/Settlement?allhalf=2&id=');" class="layui-btn layui-btn-sm">结算上半场</a>@endif
-                        @if(checkRriv('/admin/sportsfoot/Settlement'))<a href="javascript:allbalance('/admin/sportsfoot/Settlement?allhalf=2&id=');" class="layui-btn layui-btn-sm set">重新结算上半场</a>@endif
+                        @if(checkRriv('/admin/sportsfoot/Settlement'))<a href="javascript:allbalance('/admin/sportsfoot/Settlement?allhalf=1&type=zq&id=');" class="layui-btn layui-btn-sm set">结算全场</a>@endif
+                        @if(checkRriv('/admin/sportsfoot/Settlement'))<a href="javascript:allbalance('/admin/sportsfoot/Settlement?allhalf=2&type=zq&id=');" class="layui-btn layui-btn-sm">结算上半场</a>@endif
+                        @if(checkRriv('/admin/sportsfoot/Settlement'))<a href="javascript:allbalance('/admin/sportsfoot/Settlement?allhalf=2&type=zq&id=');" class="layui-btn layui-btn-sm set">重新结算上半场</a>@endif
                         {{--@if(checkRriv('/admin/sportsfoot/revokeft'))<a href="javascript:allrevoke('/admin/sportsfoot/revokeft?iszf=1&id=');" class="layui-btn layui-btn-sm  layui-btn-danger">作废</a>@endif--}}
                     </div>
                 </div>
@@ -479,7 +479,7 @@
                         }
                     }
 
-                    html += '<br><div style="margin:0px auto 10px;width: 112px;"><button class="layui-btn layui-btn-sm set" id="buttonClick" onclick="rlClick()"><h3>确定</h3></button>&nbsp;<button onclick="rlClick()" class="layui-btn layui-btn-sm layui-btn-danger" id="reset"><h3>取消</h3></button></div></div>';
+                    html += '<br><div style="margin:0px auto 10px;width: 112px;"><button class="layui-btn layui-btn-sm set" id="buttonClick" onclick="rlClick()"><h3>确定</h3></button>&nbsp;<!--<button onclick="rlClick()" class="layui-btn layui-btn-sm layui-btn-danger" id="reset"><h3>取消</h3></button>--></div></div>';
 
                     resultLogOpen = layer.open({
                         type: 1 //Page层类型