异常处理

app/Http/Controllers/Admin/SportsbkController.php

@@ -81,7 +81,7 @@ class SportsbkController extends Controller {
 		$match_id = $req->matchid;
 		$model = \App\Models\Stlqresult::where('match_id', $match_id)->first();
 		$match = \App\Models\SportsBasket::where('id', $match_id)->first();
-		$match_status = $match->status;
+		$match_status = $match['status'];
 
 		$data = array(
 			"1" => array(
@@ -114,11 +114,32 @@ class SportsbkController extends Controller {
 			),
 		);
 
+		$guestscore =array(
+			'1' => $data[1]['guest'],//第一节客队比分
+			'2' => $data[2]['guest'],//第二节客队比分
+			'3' => $data[3]['guest'],//第三节客队比分
+			'4' => $data[4]['guest'],//第四节客队比分
+			'5' => $data[5]['guest'],//上半场客队比分
+			'6' => $data[6]['guest'],//下半场客队比分
+			'all' => $data["all"]['guest'],//全场客队比分
+		);
+		$homescore =array(
+			'1' => $data[1]['home'],//第一节客队比分
+			'2' => $data[2]['home'],//第二节客队比分
+			'3' => $data[3]['home'],//第三节客队比分
+			'4' => $data[4]['home'],//第四节客队比分
+			'5' => $data[5]['home'],//上半场客队比分
+			'6' => $data[6]['home'],//下半场客队比分
+			'all' => $data["all"]['home'],//全场客队比分
+		);
+
 		//赛事下注单作废 处理
-		if(in_array(-1,$data)){
+		if(in_array(-1,$guestscore) || in_array(-1,$homescore)){
 			commonFunction::HandleInvalid($data,$match_id,$match_status,'lq');
 		}
 
+//		\App\Models\Stlqresult::where('match_id', $match_id)->update(["home_score"=>json_encode($homescore),"guest_score"=>json_encode($guestscore)]);
+
 		\App\Models\Stlqresult::where('match_id', $match_id)->update(["inning"=>json_encode($data)]);
 
 		//添加赛事结果记录
@@ -161,6 +182,8 @@ class SportsbkController extends Controller {
         $list = \App\Models\Stlqresultlog::leftJoin('system_user', 'user_id', '=', 'system_user.id')
             ->select('st_lq_result_log.*', 'system_user.loginname')->where('match_id', $match_id)->orderBy('id', 'asc')->get();
 		foreach ($list as $key=>$value){
+//			$list[$key]['home_score'] = json_decode($value['home_score'], true);
+//			$list[$key]['guest_score'] = json_decode($value['guest_score'], true);
 			$list[$key]['inning'] = json_decode($value['inning'], true);
 		}
         $result =array(

app/Http/Controllers/Admin/SportsbqController.php

@@ -278,9 +278,13 @@ class SportsbqController extends Controller {
 				'guest' => intval($req->guestl)?intval($req->guestl):0,
 			),
         );
+		foreach($uscore as $key){
+			$data[] = $key['home'];
+			$data[] = $key['guest'];
+		}
 
 		//赛事下注单作废 处理
-		if(in_array(-1,$uscore)){
+		if(in_array(-1,$data)){
 			commonFunction::HandleInvalid($uscore,$match_id,$match_status,'bq');
 		}
 

app/Http/Controllers/Admin/SportsfootController.php

@@ -476,7 +476,7 @@ class SportsfootController extends Controller {
 		$match_id = $req->matchid;
 		$model = \App\Models\Stzqresult::where('match_id', $match_id)->first();
 		$match = \App\Models\SportsSoccer::where('id', $match_id)->first();
-		$match_status = $match->status;
+		$match_status = $match['status'];
 
 		$data = array(
 			"half" => array(
@@ -488,8 +488,12 @@ class SportsfootController extends Controller {
 				'guest' => intval($req->guestall)?intval($req->guestall):0,
 			),
 		);
+		$array[] = $data['half']['home'];
+		$array[] = $data['half']['guest'];
+		$array[] = $data['all']['home'];
+		$array[] = $data['all']['guest'];
 		//赛事下注单作废 处理
-		if(in_array(-1,$data)){
+		if(in_array(-1,$array)){
 			commonFunction::HandleInvalid($data,$match_id,$match_status,'zq');
 		}
 

app/Http/Controllers/Admin/SportswqController.php

@@ -266,8 +266,13 @@ class SportswqController extends Controller {
 			),
 		);
 
+		foreach($data as $key){
+			$array[] = $key['home'];
+			$array[] = $key['guest'];
+		}
+
 		//赛事下注单作废 处理
-		if(in_array(-1,$data)){
+		if(in_array(-1,$array)){
 			commonFunction::HandleInvalid($data,$match_id,$match_status,'wq');
 		}
 

app/Lib/Biz/Sport/Common.php

@@ -1436,7 +1436,7 @@ class Common
             }
             $type = 1;
 			$upapp = new \App\Models\SportsNoteList();
-			$upapp->delorder($match_id,$game_code,$match_order_sim_obj,$oddsData_str,$type);
+			$upapp->delorder($match_id,$game_code,$oddsData_sim,$oddsData_str,$type);
 		}
 		//=== end ===
 	}

app/Models/SportsNoteList.php

@@ -986,106 +986,117 @@ class SportsNoteList extends BaseModel
             $account_money = \App\Models\Account_detailed::wherein('account_identity',$account_identitys)->get();
             //反水
             $water_return_money = \App\Models\Money_details::wherein('trade_id',$order_ids)->where('trade_type', '7')->get();
+            //print_r($orders);exit;
+            //订单反水
+            foreach($water_return_money as $k=>$v){
+                foreach($orders as $kk=>$vv){
+                    $vv['return_money'] = 0;
+                    if($v['trade_id'] == $vv['order_id']){
+                        $vv['return_money'] = $v['money'];
+                    }
+                }
+            }
 
-            //用户账户余额计算
+            //用户余额
             foreach($account_money as $k=>$v){
-                //默认 余额 0
-                $account_identity = 0;
-                foreach($water_return_money as $kk=>$vv){
-                    foreach($orders as $kkk=>$vvv){
-                        //计算当前余额
-                        if($v['account_identity'] == $vvv['account_identity'] && $vv['trade_id'] == $vvv['order_id']){
-                            //第一个注单 获取用户初始余额
-                            if($account_identity == 0){
-                                //当前注单余额
-                                $vvv['available_cash'] = $v['available_cash'];
-                                //当前注单退款后的余额
-                                $account_identity = $v['available_cash']+$vvv['money']-$vv['money']-$vvv['gain_money'];
-                            }else{//其他 获取 上个注单处理后的余额
-                                $vvv['available_cash'] = $account_identity;
-                                $account_identity = $account_identity+$vvv['money']-$vv['money']-$vvv['gain_money'];
-                            }
-                            $orders[$kkk] = $vvv;
-
-                            $models = new \App\Models\Money_details();
-                            $models->info_identity = UUID();
-                            $models->trade_id = $vvv['order_id'];
-                            $models->account_name = $vvv['account_name'];
-                            $models->account_identity = $vvv['account_identity'];
-                            $change_money = $vvv['money'] - $vv['money'] - $vvv['gain_money'];
-                            $models->money = abs($change_money);
-                            $models->money_time = date("Y-m-d H:i:s", time());
-                            if ($change_money > 0) {
-                                $models->money_type = '1';
-                            } else {
-                                $models->money_type = '2';
-                            }
-                            $models->money_cash = $vvv['available_cash'];
-                            $models->trade_type = '3';
-                            $models->trade_desc = '赛事作废单式注单回款';
-                            $models->status = '1';
-                            try {
-                                DB::beginTransaction();//开启事务
-                                $this->where('id', $vvv['id'])->update(['status' => '2','use_mark'=>'通过设置赛事比分作废']);
-                                \App\Models\Account_detailed::where('account_identity', $vvv['account_identity'])->update(['available_cash' => $vvv['available_cash'], 'cash' => $vvv['available_cash']]);
-                                $models->save();
-
-                                DB::commit();//提交
-                            } catch (Exception $e) {
-                                DB::rollback();//回滚
-                            }
+                $account_money = 0;
+                foreach($orders as $kk=>$vv){
+                    if($v['account_identity'] == $vv['account_identity']){
+                        if($account_money == 0){
+                            $vv['available_cash'] = $v['available_cash'];
+                            //当前注单退款后的余额
+                            $account_money = $v['available_cash']+$vv['money']-$vv['money']-$vv['gain_money'];
+                        }else{//其他 获取 上个注单处理后的余额
+                            $vv['available_cash'] = $account_money;
+                            $account_money = $account_money+$vv['money']-$vv['money']-$vv['gain_money'];
                         }
                     }
                 }
             }
 
-//            for($i=0;$i<count($orders);$i++){
-//                //用户余额 默认
-//                $available_cash = '';
-//                for($a=0;$a<count($account_money);$a++){
-//                    if($orders[$i]['account_identity'] == $account_money[$a]['account_identity']){
-//                        $available_cash = $account_money[$a]['available_cash'];
-//                    }
-//                }
-//                $water_return = '';
-//                for($b=0;$b<count($water_return_money);$b++){
-//                    if($orders[$i]['order_id'] == $water_return_money[$b]['trade_id']){
-//                        $water_return = $water_return_money[$b]['money'];
-//                    } else {
-//                        $water_return = 0;
-//                    }
-//                }
-//
-//                $new_available_cash = $available_cash + $orders[$i]->money - $orders[$i]->gain_money - $water_return;
+            foreach($orders as $k=>$v){
+                $models = new \App\Models\Money_details();
+                $models->info_identity = UUID();
+                $models->trade_id = $v['order_id'];
+                $models->account_name = $v['account_name'];
+                $models->account_identity = $v['account_identity'];
+                $change_money = $v['money'] - $v['return_money'] - $v['gain_money'];
+                $models->money = abs($change_money);
+                $models->money_time = date("Y-m-d H:i:s", time());
+                if ($change_money > 0) {
+                    $models->money_type = '1';
+                } else {
+                    $models->money_type = '2';
+                }
+                $models->money_cash = $v['available_cash'];
+                $models->trade_type = '3';
+                $models->trade_desc = '赛事作废单式注单回款';
+                $models->status = '1';
+                try {
+                    DB::beginTransaction();//开启事务
+                    $this->where('order_id', $v['order_id'])->update(['status' => '2','use_mark'=>'通过设置赛事比分作废']);
+                    \App\Models\Account_detailed::where('account_identity', $v['account_identity'])->update(['available_cash' => $v['available_cash'], 'cash' => $v['available_cash']]);
+                    $models->save();
+
+                    DB::commit();//提交
+                } catch (Exception $e) {
+                    DB::rollback();//回滚
+                }
+
+            }
+
+//            //用户账户余额计算
+//            foreach($account_money as $k=>$v){
+//                //默认 余额 0
+//                $account_identity = 0;
+//                foreach($water_return_money as $kk=>$vv){
+//                    foreach($orders as $kkk=>$vvv){
+//                        //计算当前余额
+//                        if($v['account_identity'] == $vvv['account_identity'] && $vv['trade_id'] == $vvv['order_id']){
+//                            //第一个注单 获取用户初始余额
+//                            if($account_identity == 0){
+//                                //当前注单余额
+//                                $vvv['available_cash'] = $v['available_cash'];
+//                                //当前注单退款后的余额
+//                                $account_identity = $v['available_cash']+$vvv['money']-$vv['money']-$vvv['gain_money'];
+//                            }else{//其他 获取 上个注单处理后的余额
+//                                $vvv['available_cash'] = $account_identity;
+//                                $account_identity = $account_identity+$vvv['money']-$vv['money']-$vvv['gain_money'];
+//                            }
+//                            $orders[$kkk] = $vvv;
 //
-//                $models = new \App\Models\Money_details();
-//                $models->info_identity = UUID();
-//                $models->trade_id = $orders[$i]->order_id;
-//                $models->account_name = $orders[$i]->account_name;
-//                $models->account_identity = $orders[$i]->account_identity;
-//                $models->money = abs($orders[$i]->money - $orders[$i]->gain_money - $water_return);
-//                $models->money_time = date("Y-m-d H:i:s", time());
-//                if ($new_available_cash > $available_cash) {
-//                    $models->money_type = '1';
-//                } else {
-//                    $models->money_type = '2';
-//                }
-//                $models->money_cash = $new_available_cash;
-//                $models->trade_type = '3';
-//                $models->trade_desc = '赛事作废单式注单回款';
-//                $models->status = '1';
-//                try {
-//                    DB::beginTransaction();//开启事务
-//                    $this->where('id', $orders[$i]['id'])->update(['status' => '2','use_mark'=>'通过设置赛事比分作废']);
-//                    \App\Models\Account_detailed::where('account_identity', $orders[$i]->account_identity)->update(['available_cash' => $new_available_cash, 'cash' => $new_available_cash]);
-//                    $models->save();
+//                            $models = new \App\Models\Money_details();
+//                            $models->info_identity = UUID();
+//                            $models->trade_id = $vvv['order_id'];
+//                            $models->account_name = $vvv['account_name'];
+//                            $models->account_identity = $vvv['account_identity'];
+//                            $change_money = $vvv['money'] - $vv['money'] - $vvv['gain_money'];
+//                            $models->money = abs($change_money);
+//                            $models->money_time = date("Y-m-d H:i:s", time());
+//                            if ($change_money > 0) {
+//                                $models->money_type = '1';
+//                            } else {
+//                                $models->money_type = '2';
+//                            }
+//                            $models->money_cash = $vvv['available_cash'];
+//                            $models->trade_type = '3';
+//                            $models->trade_desc = '赛事作废单式注单回款';
+//                            $models->status = '1';
+//                            try {
+//                                DB::beginTransaction();//开启事务
+//                                $this->where('order_id', $vvv['order_id'])->update(['status' => '2','use_mark'=>'通过设置赛事比分作废']);
+//                                \App\Models\Account_detailed::where('account_identity', $vvv['account_identity'])->update(['available_cash' => $vvv['available_cash'], 'cash' => $vvv['available_cash']]);
+//                                $models->save();
 //
-//                    DB::commit();//提交
-//                } catch (Exception $e) {
-//                    DB::rollback();//回滚
+//                                DB::commit();//提交
+//                            } catch (Exception $e) {
+//                                DB::rollback();//回滚
+//                            }
+//                        }
+//                    }
 //                }
-//
 //            }
+
         }
 
         //该赛事相关的的串关注单做平局处理

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

@@ -420,6 +420,44 @@
             })
         }
 
+        //修改赛事比分  only:唯一 num:inputval match_id:match_id
+        function teamscore(match_id){
+            var match_id = match_id;
+            // var reg = /^[0-99]\d*$/;
+            var okteamscore = $("#okteamscore"+match_id).val();
+            var ozteamscore = $("#ozteamscore"+match_id).val();
+            var tkteamscore = $("#tkteamscore"+match_id).val();
+            var tzteamscore = $("#tzteamscore"+match_id).val();
+            var skteamscore = $("#skteamscore"+match_id).val();
+            var szteamscore = $("#szteamscore"+match_id).val();
+            var akteamscore = $("#akteamscore"+match_id).val();
+            var azteamscore = $("#azteamscore"+match_id).val();
+            var match_status = document.getElementById("match_status"+match_id).value;
+
+
+            // if(reg.test(num)==false){
+            //     layer.msg('不能为空值');
+            //     reloadDataTable();return;
+            // }
+
+            $.ajax({
+                type: 'POST',
+                dataType: 'json',
+                url: '/admin/Sportsbk/updatascore',
+                data: {match_id:match_id,okteamscore:okteamscore,ozteamscore:ozteamscore,tkteamscore:tkteamscore,tzteamscore:tzteamscore,skteamscore:skteamscore,szteamscore:szteamscore,akteamscore:akteamscore,azteamscore:azteamscore,match_status:match_status},
+                success: function(data) {
+                    /*
+                     if(data.status==1){
+                     layer.msg(data.msg);
+                     location. reload()//刷新当前页面
+                     }
+                     */
+                    layer.msg(data.msg);
+                    location. reload()//刷新当前页面
+                }
+            })
+        }
+
         //刷新赛事数据
         function refreshall(game_code){ 
             var game_code = game_code;
@@ -449,6 +487,7 @@
                 url: '/admin/Sportsbk/resultLog',
                 data: {match_id:match_id},
                 success: function(data) {
+                    //console.log(data)
                     let length = data.list.length;
                     if(length <= 0){
                         layer.alert('该赛事还没有比分记录');
@@ -486,7 +525,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>';
-                    console.log(html);
+                    //console.log(html);
                     resultLogOpen = layer.open({
                         type: 1 //Page层类型
                         ,area: ['660px', '500px']

resources/views/sports/sports_search_handle.blade.php

@@ -502,7 +502,7 @@
                     content += '</div>';
                     // 打开弹窗.
                     layer.open({
-                        area: ['400px', '480px'], //宽高
+                        area: ['400px', '320px'], //宽高
                         type: 1,
                         title: '注单作废',
                         content: content, //这里content是一个DOM，注意：最好该元素要存放在body最外层，否则可能被其它的相对元素所影响,