彭俊 6 سال پیش
والد
کامیت
dbc67408e0

+ 9 - 4
app/Http/Controllers/Admin/SportsbkController.php

@@ -222,6 +222,7 @@ class SportsbkController extends Controller {
 	//结算
 	function Settlement1(Req $req){
 		$match_id = $req->match_id;
+		$match = \App\Models\SportsBasket::where('id', $match_id)->first();
 		$type = $req->type;
 		$process = $req->process;
 		if(empty($process)){
@@ -301,6 +302,11 @@ class SportsbkController extends Controller {
 		if($winfail == false){
 			return json_encode(['status'=>2,'msg'=>'判断输赢错误,请联系管理员!!!']);//输赢错误
 		}
+
+		$change_status = 1;
+		if($match['status'] == 0 || $match['status'] == 1){
+			$change_status = 0;
+		}
 		$sim = array(
 			'token'=>$token,
 			'order_ids'=>'', //订单id字符串,用半角都好分隔
@@ -308,7 +314,7 @@ class SportsbkController extends Controller {
 			'settype'=>2, //结算次数  1首次  2非首次
 			'game_code'=>$type, //赛事类型  zq lq wq bq
 			'match_id'=>$match_id,  // 赛事ID
-			'change_status'=>1  //是否改状态
+			'change_status'=>$change_status  //是否改状态
 		);
 		$str = array(
 			'token'=>$token,
@@ -317,7 +323,7 @@ class SportsbkController extends Controller {
 			'settype'=>2, //结算次数  1首次  2非首次
 			'game_code'=>$type, //赛事类型  zq lq wq bq
 			'match_id'=>$match_id,  // 赛事ID
-			'change_status'=>1  //是否改状态
+			'change_status'=>$change_status  //是否改状态
 		);
 		if(count($simplex_ids)>0 || count($str_ids)>0){
 			//单式结算
@@ -357,8 +363,7 @@ class SportsbkController extends Controller {
 				session('adminInfo.admin_name'),
 			);
 			OperationLog(session('adminInfo.admin_id'), '蓝球结算', $log);
-			$res = \App\Models\SportsBasket::where ('id', $match_id)->first();
-			if($res['status'] == 1){
+			if($match['status'] == 0 || $match['status'] == 1){
 				return json_encode(['status'=>4,'msg'=>'该赛事进程下没有任何订单']);
 			}
 			$res = \App\Models\Stlqresult::where ('match_id', $match_id)->update(['status' =>3]);

+ 9 - 4
app/Http/Controllers/Admin/SportsbqController.php

@@ -131,6 +131,7 @@ class SportsbqController extends Controller {
 	//结算
 	function Settlement1(Req $req){
 		$match_id = $req->match_id;
+		$match = \App\Models\SportsBase::where ('id', $match_id)->first();
 		$type = $req->type;
 		$process = $req->process;
 		if(empty($process)){
@@ -234,6 +235,11 @@ class SportsbqController extends Controller {
 		if($winfail == false){
 			return json_encode(['status'=>2,'msg'=>'判断输赢错误,请联系管理员!!!']);//输赢错误
 		}
+
+		$change_status = 1;
+		if($match['status'] == 0 || $match['status'] == 1){
+			$change_status = 0;
+		}
 		$sim = array(
 			'token'=>$token,
 			'order_ids'=>'', //订单id字符串,用半角都好分隔
@@ -241,7 +247,7 @@ class SportsbqController extends Controller {
 			'settype'=>2, //结算次数  1首次  2非首次
 			'game_code'=>$type, //赛事类型  zq lq wq bq
 			'match_id'=>$match_id,  // 赛事ID
-			'change_status'=>1  //是否改状态
+			'change_status'=>$change_status  //是否改状态
 		);
 		$str = array(
 			'token'=>$token,
@@ -250,7 +256,7 @@ class SportsbqController extends Controller {
 			'settype'=>2, //结算次数  1首次  2非首次
 			'game_code'=>$type, //赛事类型  zq lq wq bq
 			'match_id'=>$match_id,  // 赛事ID
-			'change_status'=>1  //是否改状态
+			'change_status'=>$change_status  //是否改状态
 		);
 		if(count($simplex_ids)>0 || count($str_ids)>0){
 			//单式结算
@@ -290,8 +296,7 @@ class SportsbqController extends Controller {
 				session('adminInfo.admin_name'),
 			);
 			OperationLog(session('adminInfo.admin_id'), '足球结算', $log);
-			$res = \App\Models\SportsBase::where ('id', $match_id)->first();
-			if($res['status'] == 1){
+			if($match['status'] == 0 || $match['status'] == 1){
 				return json_encode(['status'=>4,'msg'=>'该赛事进程下没有任何订单']);
 			}
 			$res = \App\Models\Stbqresult::where ('match_id', $match_id)->update(['status' =>3]);

+ 9 - 4
app/Http/Controllers/Admin/SportsfootController.php

@@ -17,6 +17,7 @@ class SportsfootController extends Controller {
 
 	function Settlement1(Req $req){
 		$match_id = $req->match_id;
+		$match = \App\Models\SportsSoccer::where ('id', $match_id)->first();
 		$type = $req->type;
 		$process = $req->process;
 		if(empty($process)){
@@ -80,6 +81,11 @@ class SportsfootController extends Controller {
 		if($winfail == false){
 			return json_encode(['status'=>2,'msg'=>'判断输赢错误,请联系管理员!!!']);//输赢错误
 		}
+
+		$change_status = 1;
+		if($match['status'] == 0 || $match['status'] == 1){
+			$change_status = 0;
+		}
 		$sim = array(
 			'token'=>$token,
 			'order_ids'=>'', //订单id字符串,用半角都好分隔
@@ -87,7 +93,7 @@ class SportsfootController extends Controller {
 			'settype'=>2, //结算次数  1首次  2非首次
 			'game_code'=>$type, //赛事类型  zq lq wq bq
 			'match_id'=>$match_id,  // 赛事ID
-			'change_status'=>1  //是否改状态
+			'change_status'=>$change_status  //是否改状态
 		);
 		$str = array(
 			'token'=>$token,
@@ -96,7 +102,7 @@ class SportsfootController extends Controller {
 			'settype'=>2, //结算次数  1首次  2非首次
 			'game_code'=>$type, //赛事类型  zq lq wq bq
 			'match_id'=>$match_id,  // 赛事ID
-			'change_status'=>1  //是否改状态
+			'change_status'=>$change_status  //是否改状态
 		);
 		if(count($simplex_ids)>0 || count($str_ids)>0){
 			//单式结算
@@ -136,8 +142,7 @@ class SportsfootController extends Controller {
 				session('adminInfo.admin_name'),
 			);
 			OperationLog(session('adminInfo.admin_id'), '足球结算', $log);
-			$res = \App\Models\SportsSoccer::where ('id', $match_id)->first();
-			if($res['status'] == 1){
+			if($match['status'] == 0 || $match['status'] == 1){
 				return json_encode(['status'=>4,'msg'=>'该赛事进程下没有任何订单']);
 			}
 			$res = \App\Models\Stzqresult::where ('match_id', $match_id)->update(['status' =>3]);

+ 9 - 4
app/Http/Controllers/Admin/SportswqController.php

@@ -142,6 +142,7 @@ class SportswqController extends Controller {
 	//结算
 	function Settlement1(Req $req){
 		$match_id = $req->match_id;
+		$match = \App\Models\SportsTennis::where ('id', $match_id)->first();
 		$type = $req->type;
 		$process = $req->process;
 		if(empty($process)){
@@ -216,6 +217,11 @@ class SportswqController extends Controller {
 		if($winfail == false){
 			return json_encode(['status'=>2,'msg'=>'判断输赢错误,请联系管理员!!!']);//输赢错误
 		}
+
+		$change_status = 1;
+		if($match['status'] == 0 || $match['status'] == 1){
+			$change_status = 0;
+		}
 		$sim = array(
 			'token'=>$token,
 			'order_ids'=>'', //订单id字符串,用半角都好分隔
@@ -223,7 +229,7 @@ class SportswqController extends Controller {
 			'settype'=>2, //结算次数  1首次  2非首次
 			'game_code'=>$type, //赛事类型  zq lq wq bq
 			'match_id'=>$match_id,  // 赛事ID
-			'change_status'=>1  //是否改状态
+			'change_status'=>$change_status  //是否改状态
 		);
 		$str = array(
 			'token'=>$token,
@@ -232,7 +238,7 @@ class SportswqController extends Controller {
 			'settype'=>2, //结算次数  1首次  2非首次
 			'game_code'=>$type, //赛事类型  zq lq wq bq
 			'match_id'=>$match_id,  // 赛事ID
-			'change_status'=>1  //是否改状态
+			'change_status'=>$change_status  //是否改状态
 		);
 		if(count($simplex_ids)>0 || count($str_ids)>0){
 			//单式结算
@@ -272,8 +278,7 @@ class SportswqController extends Controller {
 				session('adminInfo.admin_name'),
 			);
 			OperationLog(session('adminInfo.admin_id'), '网球结算', $log);
-			$res = \App\Models\SportsTennis::where ('id', $match_id)->first();
-			if($res['status'] == 1){
+			if($match['status'] == 0 || $match['status'] == 1){
 				return json_encode(['status'=>4,'msg'=>'该赛事进程下没有任何订单']);
 			}
 			$res = \App\Models\Stwqresult::where ('match_id', $match_id)->update(['status' =>3]);

+ 13 - 2
resources/views/admin/Sportsbq/outcome.blade.php

@@ -520,7 +520,7 @@
                     html += '<div style="height: 100px;"><ul>';
                     for(let i=0; i<length; i++){
 
-                        html +='<li style="float: left;margin-left: 20px;"><input class="checkone" type="checkbox" value="'+data[i]['process']+'">'+data[i]['name']+'</li>';
+                        html +='<li style="float: left;margin-left: 20px;"><input class="checkone" onclick="onecheck()" type="checkbox" value="'+data[i]['process']+'">'+data[i]['name']+'</li>';
 
                     }
 
@@ -571,7 +571,7 @@
 
         //结算弹框全选/取消
         function oncheck() {
-            console.log(1);
+            //console.log(1);
             if($('.checkall').is(':checked')==true){
                 $('.checkone').prop('checked',true);
             }else{
@@ -579,6 +579,17 @@
             }
         }
 
+        function onecheck(){
+//            console.log(1);
+            var checkedinput = $("input[class='checkone']:checked").length;
+            var input = $("input[class='checkone']").length;
+            if(checkedinput == input){
+                $('.checkall').prop('checked',true);
+            }else{
+                $('.checkall').prop('checked',false);
+            }
+        }
+
 	</script>
 @push('dataTableJS')
 /*var active = {

+ 13 - 2
resources/views/admin/Sportswq/outcome.blade.php

@@ -458,7 +458,7 @@
                     html += '<div style="height: 100px;"><ul>';
                     for(let i=0; i<length; i++){
 
-                        html +='<li style="float: left;margin-left: 20px;"><input class="checkone" type="checkbox" value="'+data[i]['process']+'">'+data[i]['name']+'</li>';
+                        html +='<li style="float: left;margin-left: 20px;"><input class="checkone" onclick="onecheck()" type="checkbox" value="'+data[i]['process']+'">'+data[i]['name']+'</li>';
 
                     }
 
@@ -509,7 +509,7 @@
 
         //结算弹框全选/取消
         function oncheck() {
-            console.log(1);
+            //console.log(1);
             if($('.checkall').is(':checked')==true){
                 $('.checkone').prop('checked',true);
             }else{
@@ -517,6 +517,17 @@
             }
         }
 
+        function onecheck(){
+//            console.log(1);
+            var checkedinput = $("input[class='checkone']:checked").length;
+            var input = $("input[class='checkone']").length;
+            if(checkedinput == input){
+                $('.checkall').prop('checked',true);
+            }else{
+                $('.checkall').prop('checked',false);
+            }
+        }
+
 	</script>
 @push('dataTableJS')
 /*var active = {

+ 13 - 2
resources/views/admin/sportsbk/outcome.blade.php

@@ -684,7 +684,7 @@
                     html += '<div style="height: 100px;"><ul>';
                     for(let i=0; i<length; i++){
 
-                        html +='<li style="float: left;margin-left: 20px;"><input class="checkone" type="checkbox" value="'+data[i]['process']+'">'+data[i]['name']+'</li>';
+                        html +='<li style="float: left;margin-left: 20px;"><input class="checkone" onclick="onecheck()" type="checkbox" value="'+data[i]['process']+'">'+data[i]['name']+'</li>';
 
                     }
 
@@ -736,7 +736,7 @@
 
         //结算弹框全选/取消
         function oncheck() {
-            console.log(1);
+            //console.log(1);
             if($('.checkall').is(':checked')==true){
                 $('.checkone').prop('checked',true);
             }else{
@@ -744,6 +744,17 @@
             }
         }
 
+        function onecheck(){
+//            console.log(1);
+            var checkedinput = $("input[class='checkone']:checked").length;
+            var input = $("input[class='checkone']").length;
+            if(checkedinput == input){
+                $('.checkall').prop('checked',true);
+            }else{
+                $('.checkall').prop('checked',false);
+            }
+        }
+
 	</script>
 @push('dataTableJS')
 /*var active = {

+ 13 - 2
resources/views/admin/sportsfoot/outcome.blade.php

@@ -557,7 +557,7 @@
                     html += '<div style="height: 100px;"><ul>';
                     for(let i=0; i<length; i++){
 
-                        html +='<li style="float: left;margin-left: 20px;"><input class="checkone" type="checkbox" value="'+data[i]['process']+'">'+data[i]['name']+'</li>';
+                        html +='<li style="float: left;margin-left: 20px;"><input class="checkone" onclick="onecheck()" type="checkbox" value="'+data[i]['process']+'">'+data[i]['name']+'</li>';
 
                     }
 
@@ -608,13 +608,24 @@
 
         //结算弹框全选/取消
         function oncheck() {
-            console.log(1);
+            //console.log(1);
             if($('.checkall').is(':checked')==true){
                 $('.checkone').prop('checked',true);
             }else{
                 $('.checkone').prop('checked',false);
             }
         }
+        //
+        function onecheck(){
+//            console.log(1);
+            var checkedinput = $("input[class='checkone']:checked").length;
+            var input = $("input[class='checkone']").length;
+            if(checkedinput == input){
+                $('.checkall').prop('checked',true);
+            }else{
+                $('.checkall').prop('checked',false);
+            }
+        }
 
     </script>
 @push('dataTableJS')