后台异常处理

app/Http/Controllers/Admin/LoginController.php

@@ -46,9 +46,8 @@ class LoginController extends Controller {
 	    );
 	    OperationLog(session('adminInfo.admin_id'), 'logout', $log);
 		$req->session()->flush();
-        $req->session()->regenerate();
-		// header('location:/admin/login/index');
-		 return view('admin.login/index');
+		$req->session()->regenerate();
+		return view('admin.login/index');
 	}
 
 	function Errors(){

app/Http/Controllers/Admin/SportsbkController.php

@@ -114,26 +114,6 @@ class SportsbkController extends Controller {
 	}
 
 	//结算
-	// function Settlementlq(Req $req){
-	// 	//查询赛事下所有订单
-	// 	$ssid = $req->match_id;//赛事id
-	// 	$type = $req->type;//是否再结算1,首次结算2,再次结算
-	// 	$newapp = new \App\Models\MoneyBuyMatch();
-	// 	$simplex_ids = array_column($newapp->allsimplexorder($ssid,'lq'),'order_id');
-	// 	$str_ids = array_column($newapp->allstrorder($ssid),'order_id');
-
-	// 	$addnew = new \App\Models\Comendnotice();
-	// 	$update = $addnew->addcomendnotice($ssid,'lq');
-	// 	if($update['status']==1){
-	// 		$SettlementOrder = new SettlementOrder();
-	//         $SettlementOrder->reSettlement($str_ids, 2,$type,$this->code,$ssid);//串式
-	//         $data = $SettlementOrder->reSettlement($simplex_ids, 1,$type,$this->code,$ssid);//单式注单
-	//         return responseToJson($data);
-	//     }else{
-	//     	return responseToJson($update);
-	//     }
-	// }
-	
 	function Settlementlq(Req $req){
 		$jsurl = config('sconstant.url');//结算请求域名地址
 		$match_id = $req->match_id;
@@ -152,47 +132,39 @@ class SportsbkController extends Controller {
 			if(json_decode($requet,true)['status']==1){
 			    $napp = new \App\Models\Stzqresult();
 				//单式结算
-				if($simplex_ids){
-					$simplex = array(
-			            'token'=>$token,  
-			            'order_ids'=>'', //订单id字符串，用半角都好分隔
-			            'bettype'=>1, //结算类型  1单式  2串式 
-			            'settype'=>2, //结算次数  1首次  2非首冷饮
-			            'game_code'=>'lq', //赛事类型  zq lq wq bq
-			            'match_id'=>$match_id, // 赛事ID
-			            'change_status'=>1   //是否改状态
-			        );
-			        $url=$jsurl.'/Settelement';
-			        $simplex_res = $napp->post_curls($url,$simplex);//返回json
-					$huawei_res = json_decode($simplex_res,true);
-				}else{
-					$huawei_res['status']==1;
-				}
-
-				//串式结算
-				if($str_ids){
-					$tandem = array(
-			            'token'=>$token,  
-			            'order_ids'=>'', //订单id字符串，用半角都好分隔
-			            'bettype'=>2, //结算类型  1单式  2串式 
-			            'settype'=>2, //结算次数  1首次  2非首冷饮
-			            'game_code'=>'lq', //赛事类型  zq lq wq bq
-			            'match_id'=>$match_id,  // 赛事ID
-			            'change_status'=>1  //是否改状态
-			        );
-			        $url=$jsurl.'/Settelement';
-			        $tandem_res = $napp->post_curls($url,$tandem);//返回json
-					$tandem_res = json_decode($tandem_res,true);
-				}else{
-					$tandem_res['status']==1;	
-				}
-				if($huawei_res['status']==1 || $tandem_res['status']==1){
-					return json_encode(['status'=>1,'msg'=>'结算成功']);
-				}else{
-					return json_encode(['status'=>3,'msg'=>'结算有误,请联系管理员!!!']);//结算错误
+				if(count($simplex_ids)>0 && count($str_ids)==0){
+					$huawei_res = $napp->simplexs($token,$match_id,$jsurl,'lq');
+					
+					if($huawei_res['status']==1){
+						return json_encode(['status'=>1,'msg'=>'单式结算成功,没有串式订单']);
+					}else{
+						return json_encode(['status'=>3,'msg'=>'单式结算有误,请联系管理员!!!('.$huawei_res['msg'].')']);//结算错误
+					}
+				}elseif(count($str_ids)>0 && count($simplex_ids)==0){
+					//串式结算
+					$tandem_res = $napp->tandems($token,$match_id,$jsurl,'lq');
+
+					if($tandem_res['status']==1){
+						return json_encode(['status'=>1,'msg'=>'串式结算成功,没有单式订单']);
+					}else{
+						return json_encode(['status'=>3,'msg'=>'串式结算有误,请联系管理员!!!('.$tandem_res['msg'].')']);//结算错误
+					}
+				}elseif(count($str_ids)>0 && count($simplex_ids)>0){
+					//既有单式又有串式
+					$huawei_res = $napp->simplexs($token,$match_id,$jsurl,'lq');
+
+					//串式结算
+					$tandem_res = $napp->tandems($token,$match_id,$jsurl,'lq');
+					if($tandem_res['status']==1 && $huawei_res['status']==1){
+						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'=>'返回参数不对']); 
+					}
 				}
 			}else{
-				return json_encode(['status'=>2,'msg'=>'结算有错,请联系管理员!!!']);;//输赢错误
+				return json_encode(['status'=>2,'msg'=>'判断输赢错误,请联系管理员!!!']);;//输赢错误
 			}
 		}else{
 			$res = \App\Models\Stlqresult::where ('match_id', $match_id)->update(['status' =>3]);

app/Http/Controllers/Admin/SportsbqController.php

@@ -111,25 +111,6 @@ class SportsbqController extends Controller {
 	}
 
 	//结算
-	// function Settlement(Req $req){
-	// 	//查询赛事下所有订单
-	// 	$ssid = $req->match_id;//赛事id
-	// 	$type = $req->type;//是否再结算1,首次结算2,再次结算
-	// 	$newapp = new \App\Models\MoneyBuyMatch();
-	// 	$simplex_ids = array_column($newapp->allsimplexorder($ssid,'bq'),'order_id');
-	// 	$str_ids = array_column($newapp->allstrorder($ssid),'order_id');
-
-	// 	$update = $this->addcomendnotice($ssid);
-	// 	if($update['status']==1){
-	// 		$SettlementOrder = new SettlementOrder();
-	//         $SettlementOrder->reSettlement($str_ids, 2,$type,'bq',$ssid);//串式
-	//         $data = $SettlementOrder->reSettlement($simplex_ids, 1,$type,'bq',$ssid);//单式注单
-	//         return responseToJson($data);
-	//     }else{
-	//     	return responseToJson($update);
-	//     }
-	// }
-
 	function Settlement(Req $req){
 		$jsurl = config('sconstant.url');//结算请求域名地址
 		$match_id = $req->match_id;
@@ -148,47 +129,39 @@ class SportsbqController extends Controller {
 			if(json_decode($requet,true)['status']==1){
 				$napp = new \App\Models\Stzqresult();
 				//单式结算
-				if($simplex_ids){
-					$simplex = array(
-			            'token'=>$token,  
-			            'order_ids'=>'', //订单id字符串，用半角都好分隔
-			            'bettype'=>1, //结算类型  1单式  2串式 
-			            'settype'=>2, //结算次数  1首次  2非首冷饮
-			            'game_code'=>'bq', //赛事类型  zq lq wq bq
-			            'match_id'=>$match_id, // 赛事ID
-			            'change_status'=>1   //是否改状态
-			        );
-			        $url=$jsurl.'/Settelement';
-			        $simplex_res = $napp->post_curls($url,$simplex);//返回json
-					$huawei_res = json_decode($simplex_res,true);
-				}else{
-					$huawei_res['status']==1;	
-				}
-
-				//串式结算
-				if($str_ids){
-					$tandem = array(
-			            'token'=>$token,  
-			            'order_ids'=>'', //订单id字符串，用半角都好分隔
-			            'bettype'=>2, //结算类型  1单式  2串式 
-			            'settype'=>2, //结算次数  1首次  2非首冷饮
-			            'game_code'=>'bq', //赛事类型  zq lq wq bq
-			            'match_id'=>$match_id,  // 赛事ID
-			            'change_status'=>1  //是否改状态
-			        );
-			        $url=$jsurl.'/Settelement';
-			        $tandem_res = $napp->post_curls($url,$tandem);//返回json
-					$tandem_res = json_decode($tandem_res,true);
-				}else{
-					$tandem_res['status']==1;
-				}
-				if($huawei_res['status']==1 || $tandem_res['status']==1){
-					return json_encode(['status'=>1,'msg'=>'结算成功']);
-				}else{
-					return json_encode(['status'=>3,'msg'=>'结算有误,请联系管理员!!!']);//结算错误
+				if(count($simplex_ids)>0 && count($str_ids)==0){
+					$huawei_res = $napp->simplexs($token,$match_id,$jsurl,'bq');
+					
+					if($huawei_res['status']==1){
+						return json_encode(['status'=>1,'msg'=>'单式结算成功,没有串式订单']);
+					}else{
+						return json_encode(['status'=>3,'msg'=>'单式结算有误,请联系管理员!!!('.$huawei_res['msg'].')']);//结算错误
+					}
+				}elseif(count($str_ids)>0 && count($simplex_ids)==0){
+					//串式结算
+					$tandem_res = $napp->tandems($token,$match_id,$jsurl,'bq');
+
+					if($tandem_res['status']==1){
+						return json_encode(['status'=>1,'msg'=>'串式结算成功,没有单式订单']);
+					}else{
+						return json_encode(['status'=>3,'msg'=>'串式结算有误,请联系管理员!!!('.$tandem_res['msg'].')']);//结算错误
+					}
+				}elseif(count($str_ids)>0 && count($simplex_ids)>0){
+					//既有单式又有串式
+					$huawei_res = $napp->simplexs($token,$match_id,$jsurl,'bq');
+
+					//串式结算
+					$tandem_res = $napp->tandems($token,$match_id,$jsurl,'bq');
+					if($tandem_res['status']==1 && $huawei_res['status']==1){
+						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'=>'返回参数不对']); 
+					}
 				}
 			}else{
-				return json_encode(['status'=>2,'msg'=>'结算有错,请联系管理员!!!']);;//输赢错误
+				return json_encode(['status'=>2,'msg'=>'判断输赢错误,请联系管理员!!!']);;//输赢错误
 			}
 		}else{
 			$res = \App\Models\Stbqresult::where ('match_id', $match_id)->update(['status' =>3]);

app/Http/Controllers/Admin/SportsfootController.php

@@ -32,47 +32,39 @@ class SportsfootController extends Controller {
 			if(json_decode($requet,true)['status']==1){
 				$napp = new \App\Models\Stzqresult();
 				//单式结算
-				if($simplex_ids){
-					$simplex = array(
-			            'token'=>$token,  
-			            'order_ids'=>'', //订单id字符串，用半角都好分隔
-			            'bettype'=>1, //结算类型  1单式  2串式 
-			            'settype'=>2, //结算次数  1首次  2非首冷饮
-			            'game_code'=>'zq', //赛事类型  zq lq wq bq
-			            'match_id'=>$match_id, // 赛事ID
-			            'change_status'=>1   //是否改状态
-			        );
-			        $url=$jsurl.'/Settelement';
-			        $simplex_res = $napp->post_curls($url,$simplex);//返回json
-					$huawei_res = json_decode($simplex_res,true);
-				}else{
-					$huawei_res['status'] =1;
-				}
-
-				//串式结算
-				if($str_ids){
-					$tandem = array(
-			            'token'=>$token,  
-			            'order_ids'=>'', //订单id字符串，用半角都好分隔
-			            'bettype'=>2, //结算类型  1单式  2串式 
-			            'settype'=>2, //结算次数  1首次  2非首冷饮
-			            'game_code'=>'zq', //赛事类型  zq lq wq bq
-			            'match_id'=>$match_id,  // 赛事ID
-			            'change_status'=>1  //是否改状态
-			        );
-			        $url=$jsurl.'/Settelement';
-			        $tandem_res = $napp->post_curls($url,$tandem);//返回json
-					$tandem_res = json_decode($tandem_res,true);
-				}else{
-					$tandem_res['status'] =1;
-				}
-				if($huawei_res['status']==1 || $tandem_res['status']==1){
-					return json_encode(['status'=>1,'msg'=>'结算成功']);
-				}else{
-					return json_encode(['status'=>3,'msg'=>'结算有误,请联系管理员!!!']);//结算错误
+				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{
+						return json_encode(['status'=>3,'msg'=>'单式结算有误,请联系管理员!!!('.$huawei_res['msg'].')']);//结算错误
+					}
+				}elseif(count($str_ids)>0 && count($simplex_ids)==0){
+					//串式结算
+					$tandem_res = $napp->tandems($token,$match_id,$jsurl,'zq');
+
+					if($tandem_res['status']==1){
+						return json_encode(['status'=>1,'msg'=>'串式结算成功,没有单式订单']);
+					}else{
+						return json_encode(['status'=>3,'msg'=>'串式结算有误,请联系管理员!!!('.$tandem_res['msg'].')']);//结算错误
+					}
+				}elseif(count($str_ids)>0 && count($simplex_ids)>0){
+					//既有单式又有串式
+					$huawei_res = $napp->simplexs($token,$match_id,$jsurl,'zq');
+
+					//串式结算
+					$tandem_res = $napp->tandems($token,$match_id,$jsurl,'zq');
+					if($tandem_res['status']==1 && $huawei_res['status']==1){
+						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'=>'返回参数不对']); 
+					}
 				}
 			}else{
-				return json_encode(['status'=>2,'msg'=>'结算有错,请联系管理员!!!']);;//输赢错误
+				return json_encode(['status'=>2,'msg'=>'判断输赢错误,请联系管理员!!!']);;//输赢错误
 			}
 		}else{
 			$res = \App\Models\Stzqresult::where ('match_id', $match_id)->update(['status' =>3]);

app/Http/Controllers/Admin/SportswqController.php

@@ -123,86 +123,6 @@ class SportswqController extends Controller {
 	}
 
 	//结算
-	// function Settlement(Req $req){
-	// 	$allhalf = $req->allhalf?$req->allhalf:'';
-	// 	if(intval($allhalf)){
-	// 		//赛事id
-	// 		$id = $req->input('id');
-	// 		if (empty($id)) {
-	// 			return responseToJson(-2001); //
-	// 		}
-	// 		$ids = explode(',', $id);
-	// 		if (!is_array($ids) && intval($ids) < 0) {
-	// 			return responseToJson(-2002); //
-	// 		}
-	// 		if (is_array($ids) && count($ids) > 0) {
-	// 			foreach ($ids as $k => $v) {
-	// 				if (intval($v) < 1) {
-	// 					unset($ids[$k]);
-	// 				}
-	// 			}
-	// 		}
-	// 		for ($i=0; $i < count($ids); $i++) { 
-	// 			$model = \App\Models\Stwqresult::where('id', $ids[$i])->select("match_id","status")->first();
-	// 			//查询赛事下所有订单
-	// 			$ssid = $model['match_id'];//赛事id
-	// 			if($model['status']==2){
-	// 				$type = 1;;//是否再结算1,首次结算2,再次结算
-	// 			}else{
-	// 				$type = 2;//
-	// 			}
-
-	// 			$newapp = new \App\Models\MoneyBuyMatch();
-	// 			$simplex_ids = array_column($newapp->allsimplexorder($ssid,'wq'),'order_id');
-	// 			$str_ids = array_column($newapp->allstrorder($ssid),'order_id');
-
-	// 			$data = \App\Models\Comendnotice::where(['match_id'=>$ssid,'game_code'=>'wq'])->first();
-	// 			if($data){
-	// 				$tapp = new \App\Lib\Settlement\SettlementWinFail();
-	// 	            \App\Models\Comendnotice::where(['match_id'=>$ssid,'game_code'=>'wq'])->update(['status'=>0]);
-	// 				$ret = $tapp->doRun($data->toArray()['id']);
-	// 				$ret2 =$data->toArray()['id'];
-	// 	            if ($ret2['status']==1){
-	// 	                \App\Models\Comendnotice::where(['match_id'=>$ssid,'game_code'=>'wq'])->update(['status'=>4]);
-	// 	            }
-	// 	        }
-				
-	// 			$SettlementOrder = new SettlementOrder();
-	// 		    $SettlementOrder->reSettlement($str_ids, 2,$type,'wq',$ssid,$allhalf);//串式
-	// 		    $data = $SettlementOrder->reSettlement($simplex_ids, 1,$type,'wq',$ssid,$allhalf);//单式注单
-	// 		}
-	// 		return responseToJson(1);
-	// 	}else{
-	// 		//查询赛事下所有订单
-	// 		$ssid = $req->match_id;//赛事id
-	// 		$type = $req->type;//是否再结算1,首次结算2,再次结算
-				
-	// 		$newapp = new \App\Models\MoneyBuyMatch();
-	// 		$simplex_ids = array_column($newapp->allsimplexorder($ssid,'wq'),'order_id');
-	// 		$str_ids = array_column($newapp->allstrorder($ssid),'order_id');
-
-	// 		$data = \App\Models\Comendnotice::where(['match_id'=>$ssid,'game_code'=>'wq'])->first();
-	// 		if($data){
-	// 			$tapp = new \App\Lib\Settlement\SettlementWinFail();
-	// 	        \App\Models\Comendnotice::where(['match_id'=>$ssid,'game_code'=>'wq'])->update(['status'=>0]);
-	// 			$ret = $tapp->doRun($data->toArray()['id']);
-	// 			$ret2 =$data->toArray()['id'];
-	// 	        if ($ret2['status']==1){
-	// 	            \App\Models\Comendnotice::where(['match_id'=>$ssid,'game_code'=>'wq'])->update(['status'=>4]);
-	// 	        }
-	// 	    }
-				
-	// 		if($ret['status']==1){
-	// 			$SettlementOrder = new SettlementOrder();
-	// 		    $SettlementOrder->reSettlement($str_ids, 2,$type,'wq',$ssid);//串式
-	// 		    $data = $SettlementOrder->reSettlement($simplex_ids, 1,$type,'wq',$ssid);//单式注单
-	// 		    return responseToJson($data);
-	// 		}else{
-	// 		    return responseToJson($ret);
-	// 		}
-	// 	}
-	// }
-
 	function Settlement(Req $req){
 		$jsurl = config('sconstant.url');//结算请求域名地址
 		$match_id = $req->match_id;
@@ -221,47 +141,39 @@ class SportswqController extends Controller {
 			if(json_decode($requet,true)['status']==1){
 			    $napp = new \App\Models\Stzqresult();
 				//单式结算
-				if($simplex_ids){
-					$simplex = array(
-			            'token'=>$token,  
-			            'order_ids'=>'', //订单id字符串，用半角都好分隔
-			            'bettype'=>1, //结算类型  1单式  2串式 
-			            'settype'=>2, //结算次数  1首次  2非首冷饮
-			            'game_code'=>'wq', //赛事类型  zq lq wq bq
-			            'match_id'=>$match_id, // 赛事ID
-			            'change_status'=>1   //是否改状态
-			        );
-			        $url=$jsurl.'/Settelement';
-			        $simplex_res = $napp->post_curls($url,$simplex);//返回json
-					$huawei_res = json_decode($simplex_res,true);
-				}else{
-					$huawei_res['status']==1;
-				}
-
-				//串式结算
-				if($str_ids){
-					$tandem = array(
-			            'token'=>$token,  
-			            'order_ids'=>'', //订单id字符串，用半角都好分隔
-			            'bettype'=>2, //结算类型  1单式  2串式 
-			            'settype'=>2, //结算次数  1首次  2非首冷饮
-			            'game_code'=>'wq', //赛事类型  zq lq wq bq
-			            'match_id'=>$match_id,  // 赛事ID
-			            'change_status'=>1  //是否改状态
-			        );
-			        $url=$jsurl.'/Settelement';
-			        $tandem_res = $napp->post_curls($url,$tandem);//返回json
-					$tandem_res = json_decode($tandem_res,true);
-				}else{
-					$tandem_res['status']==1;
-				}
-				if($huawei_res['status']==1 || $tandem_res['status']==1){
-					return json_encode(['status'=>1,'msg'=>'结算成功']);
-				}else{
-					return json_encode(['status'=>3,'msg'=>'结算有误,请联系管理员!!!']);//结算错误
+				if(count($simplex_ids)>0 && count($str_ids)==0){
+					$huawei_res = $napp->simplexs($token,$match_id,$jsurl,'wq');
+					
+					if($huawei_res['status']==1){
+						return json_encode(['status'=>1,'msg'=>'单式结算成功,没有串式订单']);
+					}else{
+						return json_encode(['status'=>3,'msg'=>'单式结算有误,请联系管理员!!!('.$huawei_res['msg'].')']);//结算错误
+					}
+				}elseif(count($str_ids)>0 && count($simplex_ids)==0){
+					//串式结算
+					$tandem_res = $napp->tandems($token,$match_id,$jsurl,'wq');
+
+					if($tandem_res['status']==1){
+						return json_encode(['status'=>1,'msg'=>'串式结算成功,没有单式订单']);
+					}else{
+						return json_encode(['status'=>3,'msg'=>'串式结算有误,请联系管理员!!!('.$tandem_res['msg'].')']);//结算错误
+					}
+				}elseif(count($str_ids)>0 && count($simplex_ids)>0){
+					//既有单式又有串式
+					$huawei_res = $napp->simplexs($token,$match_id,$jsurl,'wq');
+
+					//串式结算
+					$tandem_res = $napp->tandems($token,$match_id,$jsurl,'wq');
+					if($tandem_res['status']==1 && $huawei_res['status']==1){
+						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'=>'返回参数不对']); 
+					}
 				}
 			}else{
-				return json_encode(['status'=>2,'msg'=>'结算有错,请联系管理员!!!']);;//输赢错误
+				return json_encode(['status'=>2,'msg'=>'判断输赢错误,请联系管理员!!!']);;//输赢错误
 			}
 		}else{
 			$res = \App\Models\Stwqresult::where ('match_id', $match_id)->update(['status' =>3]);

app/Models/Stzqresult.php

@@ -99,8 +99,41 @@ class Stzqresult extends BaseModel
  
     }
 
+    //单式结算处理
+    function simplexs($token,$match_id,$jsurl,$type){
+        $simplex = array(
+            'token'=>$token,  
+            'order_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   //是否改状态
+        );
+        $url=$jsurl.'/Settelement';
+        $simplex_res = $this->post_curls($url,$simplex);//返回json
+        $huawei_res = json_decode($simplex_res,true);
 
+        return $huawei_res;
+    }
+
+    //串式结算处理
+    function tandems($token,$match_id,$jsurl,$type){
+        $tandem = array(
+            'token'=>$token,  
+            'order_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  //是否改状态
+        );
+        $url=$jsurl.'/Settelement';
+        $tandem_res = $this->post_curls($url,$tandem);//返回json
+        $tandem_res = json_decode($tandem_res,true);
 
+        return $tandem_res;
+    }
 
 
-}
+}

resources/lang/zh-cn/error.php

@@ -246,7 +246,7 @@ return [
     //代理
     '-8010000122' => '没有数据',
     '-400844' => '用户名或密码不能为空',
-    '-400845' => '用户错误',
+    '-400845' => '管理员不存在',
     '-400846' => '密码错误',
     '-20004' => 'id不能为空',
     '-20005' => '字段与值不能为空',

resources/views/admin/login/index.blade.php

@@ -57,6 +57,12 @@
 
 <script type="text/javascript">
 
+    //获取url
+    url = GetUrlRelativePath()
+    if(url != '/admin/login/index'){
+        //追加刷新
+        window.location.reload()
+    }
     layui.use(['form'], function () {
 
         // 操作对象
@@ -86,6 +92,21 @@
         }
     })
 
+    //获取url
+    function GetUrlRelativePath()
+　　{
+　　　　var url = document.location.toString();
+　　　　var arrUrl = url.split("//");
+
+　　　　var start = arrUrl[1].indexOf("/");
+　　　　var relUrl = arrUrl[1].substring(start);//stop省略，截取从start开始到结尾的所有字符
+
+　　　　if(relUrl.indexOf("?") != -1){
+　　　　　　relUrl = relUrl.split("?")[0];
+　　　　}
+　　　　return relUrl;
+　　}
+
 </script>
 
 

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

@@ -610,13 +610,13 @@
                         location. reload()//刷新当前页面
                     }else if(data.status==2){
                         layer.msg(data.msg);
-                        reloadDataTable();return;
+                        reloadDataTable();return false;
                     }else if(data.status==4){
                         layer.msg(data.msg);
-                        reloadDataTable();return;
+                        reloadDataTable();return false;
                     }else{
                         layer.msg(data.msg);
-                        reloadDataTable();return;
+                        reloadDataTable();return false;
                     }
                 }
             })