异常处理

app/Http/Controllers/Admin/SportsbkController.php

@@ -78,32 +78,65 @@ class SportsbkController extends Controller {
 
 	//结果添加
 	function addend(Req $req){
-		$match_id = $req->input('match_id');
+		$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;
+
+		$data = array(
+			"1" => array(
+				'home' => intval($req->homeo)?intval($req->homeo):0,
+				'guest' => intval($req->guesto)?intval($req->guesto):0,
+			),
+			"2" => array(
+				'home' => intval($req->homet)?intval($req->homet):0,
+				'guest' => intval($req->guestt)?intval($req->guestt):0,
+			),
+			"3" => array(
+				'home' => intval($req->homes)?intval($req->homes):0,
+				'guest' => intval($req->guests)?intval($req->guests):0,
+			),
+			"4" => array(
+				'home' => intval($req->homef)?intval($req->homef):0,
+				'guest' => intval($req->guestf)?intval($req->guestf):0,
+			),
+			"5" => array(
+				'home' => intval($req->homeu)?intval($req->homeu):0,
+				'guest' => intval($req->guestu)?intval($req->guestu):0,
+			),
+			"6" => array(
+				'home' => intval($req->homeb)?intval($req->homeb):0,
+				'guest' => intval($req->guestb)?intval($req->guestb):0,
+			),
+			"all" => array(
+				'home' => intval($req->homen)?intval($req->homen):0,
+				'guest' => intval($req->guestn)?intval($req->guestn):0,
+			),
+		);
+
+		//赛事下注单作废 处理
+		if(in_array(-1,$data)){
+			commonFunction::HandleInvalid($data,$match_id,$match_status,'lq');
+		}
 
-		// $penaltycard = array(
-  //       	'home'=>intval($req->homeallcard)?intval($req->homeallcard):0,
-  //       	'guest'=>intval($req->guestallcard)?intval($req->guestallcard):0,
-  //       	'home_half'=>intval($req->homehalfcard)?intval($req->homehalfcard):0,
-  //       	'guest_half'=>intval($req->guesthalfcard)?intval($req->guesthalfcard):0,
-  //       );
-  //       $cornerball = array(
-  //       	'home'=>intval($req->homeallcorner)?intval($req->homeallcorner):0,
-  //       	'guest'=>intval($req->guestallcorner)?intval($req->guestallcorner):0,
-  //       	'home_half'=>intval($req->homehalfcorner)?intval($req->homehalfcorner):0,
-  //       	'guest_half'=>intval($req->guesthalfcorner)?intval($req->guesthalfcorner):0,
-  //       );
-
-		$model->first_score = $req->firstscore;
-		$model->last_score = $req->lastscore;
-		$model->match_winer = $req->matchwiner;
-		$model->u_home_score = $req->uhomescore;
-		$model->u_guest_score = $req->uguestscore;
-		// $model->penalty_card = json_encode($penaltycard);
-		// $model->corner_ball = json_encode($cornerball);
-
-        $model->save();
-        return responseToJson(1);
+		\App\Models\Stlqresult::where('match_id', $match_id)->update(["inning"=>json_encode($data)]);
+
+		//添加赛事结果记录
+		$lastLog = \App\Models\Stlqresultlog::where([
+			['match_id', $match_id],
+			['type', 1]
+		])->orderBy('id', 'asc')->first();
+		if(empty($lastLog) || $lastLog['inning'] != json_encode($data)){
+			\App\Models\Stlqresultlog::insert([
+				'match_id' => $match_id,
+				'inning' => json_encode($data),
+				'user_id' => session('adminInfo.admin_id'),
+				'type' => 1,
+				'create_at' => now()
+			]);
+		}
+
+		return responseToJson(1);
 	}
 
 	//查询赛事结果
@@ -111,10 +144,13 @@ class SportsbkController extends Controller {
 		$match_id = $req->match_id;
 		$newapp = \App\Models\Stlqresult::where('match_id', $match_id)->first();
 
+//		$array =array(
+//			'corner_ball' => json_decode($newapp['corner_ball'],true),
+//			'penalty_card' => json_decode($newapp['penalty_card'],true),
+//			'newapp' => $newapp,
+//		);
 		$array =array(
-			'corner_ball' => json_decode($newapp['corner_ball'],true),
-			'penalty_card' => json_decode($newapp['penalty_card'],true),
-			'newapp' => $newapp,
+			'lqresult' => json_decode($newapp['inning'],true),
 		);
 		return $array;
 	}
@@ -124,10 +160,9 @@ class SportsbkController extends Controller {
         $match_id = $req->match_id;
         $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);
-        }
+		foreach ($list as $key=>$value){
+			$list[$key]['inning'] = json_decode($value['inning'], true);
+		}
         $result =array(
             'status' => 200,
             'list' => $list

app/Http/Controllers/Admin/SportsbqController.php

@@ -269,6 +269,14 @@ class SportsbqController extends Controller {
                 'home' => intval($req->homej)?intval($req->homej):0,
                 'guest' => intval($req->guestj)?intval($req->guestj):0,
             ),
+			"five" => array(
+				'home' => intval($req->homek)?intval($req->homek):0,
+				'guest' => intval($req->guestk)?intval($req->guestk):0,
+			),
+			"all" => array(
+				'home' => intval($req->homel)?intval($req->homel):0,
+				'guest' => intval($req->guestl)?intval($req->guestl):0,
+			),
         );
 
 		//赛事下注单作废 处理

app/Http/Controllers/Admin/SportsfootController.php

@@ -475,6 +475,23 @@ class SportsfootController extends Controller {
 	function addend(Req $req){
 		$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;
+
+		$data = array(
+			"half" => array(
+				'home' => intval($req->homehalf)?intval($req->homehalf):0,
+				'guest' => intval($req->guesthalf)?intval($req->guesthalf):0,
+			),
+			"all" => array(
+				'home' => intval($req->homeall)?intval($req->homeall):0,
+				'guest' => intval($req->guestall)?intval($req->guestall):0,
+			),
+		);
+		//赛事下注单作废 处理
+		if(in_array(-1,$data)){
+			commonFunction::HandleInvalid($data,$match_id,$match_status,'zq');
+		}
 
 		$penaltycard = array(
         	'home'=>intval($req->homeallcard)?intval($req->homeallcard):0,
@@ -494,6 +511,10 @@ class SportsfootController extends Controller {
         	'scoretype'=>$req->firststye ? $req->firststye:0,
         );
 
+		$model->u_home_score = $data['half']['home'];
+		$model->u_guest_score = $data['half']['guest'];
+		$model->home_score = $data['all']['home'];
+		$model->guest_score = $data['all']['guest'];
 		$model->last_score = $req->lastscore?$req->lastscore:'';
 		$model->match_winer = $req->matchwiner?$req->matchwiner:'';
 		$model->penalty_card = json_encode($penaltycard,JSON_UNESCAPED_UNICODE);
@@ -512,8 +533,16 @@ class SportsfootController extends Controller {
                 && $lastLog['first_score'] == $model->first_score
                 && $lastLog['last_score'] == $model->last_score
                 && $lastLog['match_winer'] == $model->match_winer
+				&& $lastLog['u_home_score'] == $data['half']['home']
+				&& $lastLog['u_guest_score'] == $data['half']['guest']
+				&& $lastLog['home_score'] == $data['all']['home']
+				&& $lastLog['guest_score'] == $data['all']['guest']
             )){
             \App\Models\Stzqresultlog::insert([
+				'u_home_score' => $data['half']['home'],
+				'u_guest_score' => $data['half']['guest'],
+				'home_score' => $data['all']['home'],
+				'guest_score' => $data['all']['guest'],
                 'match_id' => $match_id,
                 'penalty_card' => $model->penalty_card ,
                 'corner_ball' => $model->corner_ball,

app/Http/Controllers/Admin/SportswqController.php

@@ -260,6 +260,10 @@ class SportswqController extends Controller {
 				'home' => intval($req->homee)?intval($req->homee):0,
 				'guest' => intval($req->gueste)?intval($req->gueste):0,
 			),
+			"all" => array(
+				'home' => intval($req->homen)?intval($req->homen):0,
+				'guest' => intval($req->guestn)?intval($req->guestn):0,
+			),
 		);
 
 		//赛事下注单作废 处理

app/Lib/Biz/Sport/Common.php

@@ -1452,11 +1452,11 @@ class Common
             $matchOdds_f = [];
             foreach($match_order as $k=>$v){
                 //上半场条件
-                if($data['u_home_score'] == -1 and $data['u_guest_score'] == -1){
+                if($data['half']['home'] == -1 and $data['half']['guest'] == -1){
                     $matchOdds_h[] = self::getOrderJC('上半场',$v);
                 }
                 //全场条件
-                if($data['home_score'] == -1 and $data['guest_score'] == -1){
+                if($data['all']['home'] == -1 and $data['all']['guest'] == -1){
                     $matchOdds_f[] = self::getOrderJC('全场',$v);
                 }
             }
@@ -1486,31 +1486,31 @@ class Common
             
             foreach($match_order as $k=>$v){
                 //第一节条件
-                if($data[0] == -1 and $data[4] == -1){
+                if($data[1]['home'] == -1 and $data[1]['guest'] == -1){
                     $matchOdds_o[] = self::getOrderJC('一节',$v);
                 }
                 //第二节条件
-                if($data[1] == -1 and $data[5] == -1){
+                if($data[2]['home'] == -1 and $data[2]['guest'] == -1){
                     $matchOdds_t[] = self::getOrderJC('二节',$v);
                 }
                 //第三节条件
-                if($data[2] == -1 and $data[6] == -1){
+                if($data[3]['home'] == -1 and $data[3]['guest'] == -1){
                     $matchOdds_s[] = self::getOrderJC('三节',$v);
                 }
                 //第四节条件
-                if($data[3] == -1 and $data[7] == -1){
+                if($data[4]['home'] == -1 and $data[4]['guest'] == -1){
                     $matchOdds_f[] = self::getOrderJC('四节',$v);
                 }
                 //上半场条件
-                if($data[0] == -1 and $data[4] == -1 and $data[1] == -1 and $data[5] == -1){
+                if($data[5]['home'] == -1 and $data[5]['guest'] == -1){
                     $matchOdds_hh[] = self::getOrderJC('上半场',$v);
                 }
                 //下半场条件
-                if($data[2] == -1 and $data[6] == -1 and $data[3] == -1 and $data[7] == -1){
+                if($data[6]['home'] == -1 and $data[6]['guest'] == -1){
                     $matchOdds_ll[] = self::getOrderJC('下半场',$v);
                 }
                 //全场条件
-                if($data[0] == -1 and $data[4] == -1 and $data[1] == -1 and $data[5] == -1 and $data[2] == -1 and $data[6] == -1 and $data[3] == -1 and $data[7] == -1){
+                if($data['all']['home'] == -1 and $data['all']['guest'] == -1){
                     $matchOdds_ff[] = self::getOrderJC('全场',$v);
                     $matchOdds_ff[] = self::getOrderJC('最后一位数',$v);
                 }
@@ -1558,13 +1558,12 @@ class Common
                     $matchOdds_fi[] = self::getOrderJC('五盘',$v);
                 }
                 //全场条件
-                if($data[1]['home'] == -1 and $data[1]['guest'] == -1 and $data[2]['home'] == -1 and $data[2]['guest'] == -1 and $data[3]['home'] == -1 and $data[3]['guest'] == -1 and $data[4]['home'] == -1 and $data[4]['guest'] == -1 and $data[5]['home'] == -1 and $data[5]['guest'] == -1){
+                if($data['all']['home'] == -1 and $data['all']['guest'] == -1){
                     $matchOdds_ff[] = self::getOrderJC('让盘',$v);
                     $matchOdds_ff[] = self::getOrderJC('让局',$v);
                     $matchOdds_ff[] = self::getOrderJC('总局数',$v);
                     $matchOdds_ff[] = self::getOrderJC('冠军',$v);
                 }
-
             }
             //合并待处理 注单
             $orderData = array_merge($matchOdds_o,$matchOdds_t,$matchOdds_s,$matchOdds_fo,$matchOdds_fi,$matchOdds_ff);
@@ -1573,24 +1572,84 @@ class Common
 
         //===棒球===
         if($game_code == 'bq'){
+            //第一局
+            $matchOdds_o = [];
+            //第二局
+            $matchOdds_t = [];
+            //第三局
+            $matchOdds_th = [];
+            //第四局
+            $matchOdds_fo = [];
+            //第五局
+            $matchOdds_fi = [];
+            //第六局
+            $matchOdds_si = [];
+            //第七局
+            $matchOdds_se = [];
+            //第八局
+            $matchOdds_e = [];
+            //第九局
+            $matchOdds_n = [];
+            //其他
+            $matchOdds_ot = [];
             //前五局
             $matchOdds_five = [];
             //全场
             $matchOdds_ff = [];
 
             foreach($match_order as $k=>$v){
+                //第一局条件
+                if($data[1]['home'] == -1 and $data[1]['guest'] == -1){
+                    $matchOdds_o[] = self::getOrderJC('第一局',$v);
+                }
+                //第二局条件
+                if($data[2]['home'] == -1 and $data[2]['guest'] == -1){
+                    $matchOdds_t[] = self::getOrderJC('第二局',$v);
+                }
+                //第三局条件
+                if($data[3]['home'] == -1 and $data[3]['guest'] == -1){
+                    $matchOdds_th[] = self::getOrderJC('第三局',$v);
+                }
+                //第四局条件
+                if($data[4]['home'] == -1 and $data[4]['guest'] == -1){
+                    $matchOdds_fo[] = self::getOrderJC('第四局',$v);
+                }
+                //第五局条件
+                if($data[5]['home'] == -1 and $data[5]['guest'] == -1){
+                    $matchOdds_fi[] = self::getOrderJC('第五局',$v);
+                }
+                //第六局条件
+                if($data[6]['home'] == -1 and $data[6]['guest'] == -1){
+                    $matchOdds_si[] = self::getOrderJC('第六局',$v);
+                }
+                //第七局条件
+                if($data[7]['home'] == -1 and $data[7]['guest'] == -1){
+                    $matchOdds_se[] = self::getOrderJC('第七局',$v);
+                }
+                //第八局条件
+                if($data[8]['home'] == -1 and $data[8]['guest'] == -1){
+                    $matchOdds_e[] = self::getOrderJC('第八局',$v);
+                }
+                //第九局条件
+                if($data[9]['home'] == -1 and $data[9]['guest'] == -1){
+                    $matchOdds_n[] = self::getOrderJC('第九局',$v);
+                }
+                //其他条件
+                if($data['other']['home'] == -1 and $data['other']['guest'] == -1){
+                    $matchOdds_ot[] = self::getOrderJC('其他',$v);
+                }
                 //前五局条件
-                if($data[1]['home'] == -1 and $data[1]['guest'] == -1 and $data[2]['home'] == -1 and $data[2]['guest'] == -1 and $data[3]['home'] == -1 and $data[3]['guest'] == -1 and $data[4]['home'] == -1 and $data[4]['guest'] == -1 and $data[5]['home'] == -1 and $data[5]['guest'] == -1){
+                if($data['five']['home'] == -1 and $data['five']['guest'] == -1){
                     $matchOdds_five[] = self::getOrderJC('前5局',$v);
                 }
                 //全场条件
-                if($data[1]['home'] == -1 and $data[1]['guest'] == -1 and $data[2]['home'] == -1 and $data[2]['guest'] == -1 and $data[3]['home'] == -1 and $data[3]['guest'] == -1 and $data[4]['home'] == -1 and $data[4]['guest'] == -1 and $data[5]['home'] == -1 and $data[5]['guest'] == -1 and $data[6]['home'] == -1 and $data[6]['guest'] == -1 and $data[7]['home'] == -1 and $data[7]['guest'] == -1 and $data[8]['home'] == -1 and $data[8]['guest'] == -1 and $data[9]['home'] == -1 and $data[9]['guest'] == -1 and $data['other']['home'] == -1 and $data['other']['guest'] == -1){
+                if($data['all']['home'] == -1 and $data['all']['guest'] == -1){
                     $matchOdds_ff[] = self::getOrderJC('全场',$v);
                 }
 
             }
             //合并待处理 注单
-            $orderData = array_merge($matchOdds_five,$matchOdds_ff);
+            $orderData = array_merge($matchOdds_o,$matchOdds_t,$matchOdds_th,$matchOdds_fo,$matchOdds_fi,$matchOdds_si,$matchOdds_se,$matchOdds_e,$matchOdds_n,$matchOdds_ot,$matchOdds_five,$matchOdds_ff);
         }
         //===end===
 		

app/Models/SportsNoteList.php

@@ -986,53 +986,106 @@ 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();
-            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;
 
-                $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();
-
-                    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 = $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();//回滚
+                            }
+                        }
+                    }
                 }
-
             }
+
+//            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;
+//
+//                $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();
+//
+//                    DB::commit();//提交
+//                } catch (Exception $e) {
+//                    DB::rollback();//回滚
+//                }
+//
+//            }
         }
 
         //该赛事相关的的串关注单做平局处理

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

@@ -204,6 +204,7 @@
                 url: '/admin/Sportsfoot/Matchresult',
                 data: {match_id:match_id},
                 success: function(data) {
+                    console.log(data);
                     conttxt ='<div style="margin-left:100px;margin-top:20px;font-size:18px;line-height:150%;"><input type="hidden" id="matchid" name="matchid" value="'+match_id+'" /><div style="display: flex;"><li>主队全场角球：</li><input type="text" id="homeallcorner" name="homeallcorner" value="'+data.corner_ball.home+'" autocomplete="off"></div><div style="display: flex;"><li>客队全场角球：</li><input type="text" id="guestallcorner" name="guestallcorner" value="'+data.corner_ball.guest+'" autocomplete="off"></div><div style="display: flex;"><li>主队半场角球：</li><input type="text" id="homehalfcorner" name="homehalfcorner" value="'+data.corner_ball.home_half+'" autocomplete="off"></div><div style="display: flex;"><li>客队半场角球：</li><input type="text" id="guesthalfcorner" name="guesthalfcorner" value="'+data.corner_ball.guest_half+'" autocomplete="off"></div><div style="display: flex;"><li>主队全场罚牌：</li><input type="text" id="homeallcard" name="homeallcard" value="'+data.penalty_card.home+'" autocomplete="off"></div><div style="display: flex;"><li>客队全场罚牌：</li><input type="text" id="guestallcard" name="guestallcard" value="'+data.penalty_card.guest+'" autocomplete="off"></div><div style="display: flex;"><li>主队半场罚牌：</li><input type="text" id="homehalfcard" name="homehalfcard" value="'+data.penalty_card.home_half+'" autocomplete="off"></div><div style="display: flex;"><li>客队半场罚牌：</li><input type="text" id="guesthalfcard" name="guesthalfcard" value="'+data.penalty_card.guest_half+'" autocomplete="off"></div>';
                     if (data.newapp.home_score!=0 || data.newapp.guest_score!=0){
                         conttxt += '<div style="display: flex;"><li>首 进 球 时 间：</li><input type="text" id="onescoretime" name="onescoretime" value="'+data.first_score.scoretime+'" autocomplete="off"></div><div style="display: flex;"><li>最终获胜球队：</li><input type="text" id="matchwiner" name="matchwiner" value="'+data.newapp.match_winer+'" autocomplete="off"></div><div style="display: flex;"><li>最先进球球队：</li><select name="firstscore" id="firstscore">';
@@ -231,7 +232,7 @@
                         conttxt += '<option value="'+ data.newapp.home_team +'">'+data.newapp.home_team+'</option><option value="'+ data.newapp.guest_team +'">'+data.newapp.guest_team+'</option></select></div>';
 
                     }
-                    conttxt += '<br><div style="margin-left:230px;"><button class="layui-btn layui-btn-sm set" onclick="buttonClick()"><h3>确定</h3></button>&nbsp;<button onclick="czClick()" class="layui-btn layui-btn-sm layui-btn-danger" id="reset"><h3>取消</h3></button></div></div>';
+                    conttxt += '<div style="display: flex;"><li>上半场比分(主/客)：</li><input style="width:50px;" type="text" id="homehalf" name="homehalf" value="'+data.newapp.u_home_score+'" autocomplete="off">&nbsp;/&nbsp;<input style="width:50px;" type="text" id="guesthalf" name="guesthalf" value="'+data.newapp.u_guest_score+'" autocomplete="off"></div><div style="display: flex;"><li style="margin-left:1.1rem;">全场比分(主/客)：</li><input style="width:50px;" type="text" id="homeall" name="homeall" value="'+data.newapp.home_score+'" autocomplete="off">&nbsp;/&nbsp;<input style="width:50px;" type="text" id="guestall" name="guestall" value="'+data.newapp.guest_score+'" autocomplete="off"></div><br><div style="margin-left:230px;"><button class="layui-btn layui-btn-sm set" onclick="buttonClick()"><h3>确定</h3></button>&nbsp;<button onclick="czClick()" class="layui-btn layui-btn-sm layui-btn-danger" id="reset"><h3>取消</h3></button></div></div>';
 
                 layerOpen = layer.open({
                   type: 1 //Page层类型
@@ -265,6 +266,10 @@
             var guestallcorner = $("#guestallcorner").val();
             var homehalfcorner = $("#homehalfcorner").val();
             var guesthalfcorner = $("#guesthalfcorner").val();
+            var homehalf = $("#homehalf").val();
+            var guesthalf = $("#guesthalf").val();
+            var homeall = $("#homeall").val();
+            var guestall = $("#guestall").val();
             var reg = /^[0-99]\d*$/;
 
             $.ajax({
@@ -288,7 +293,7 @@
                             type: 'POST',
                             dataType: 'json',
                             url: '/admin/Sportsfoot/addend',
-                            data: {matchid:matchid,firstscore:firstscore,onescoretime:onescoretime,firststye:firststye,lastscore:lastscore,matchwiner:matchwiner,homeallcard:homeallcard,guestallcard:guestallcard,homehalfcard:homehalfcard,guesthalfcard:guesthalfcard,homeallcorner:homeallcorner,guestallcorner:guestallcorner,homehalfcorner:homehalfcorner,guesthalfcorner:guesthalfcorner},
+                            data: {matchid:matchid,firstscore:firstscore,onescoretime:onescoretime,firststye:firststye,lastscore:lastscore,matchwiner:matchwiner,homeallcard:homeallcard,guestallcard:guestallcard,homehalfcard:homehalfcard,guesthalfcard:guesthalfcard,homeallcorner:homeallcorner,guestallcorner:guestallcorner,homehalfcorner:homehalfcorner,guesthalfcorner:guesthalfcorner,homehalf:homehalf,guesthalf:guesthalf,homeall:homeall,guestall:guestall},
                             success: function(data) {
                                     layer.msg(data.msg);
                                     location. reload()//刷新当前页面
@@ -406,6 +411,7 @@
                 url: '/admin/Sportsfoot/resultLog',
                 data: {match_id:match_id},
                 success: function(data) {
+                    //console.log(data);
                     let length = data.list.length;
                     if(length <= 0){
                         layer.alert('该赛事还没有比分记录');
@@ -447,6 +453,8 @@
                                 '<td>最先进球球队</td>' +
                                 '<td>首球进球方式</td>' +
                                 '<td>最后进球球队</td>' +
+                                '<td>上半场部分</td>' +
+                                '<td>全场比分</td>' +
                                 '</tr>' +
                                 '<tr>' +
                                 '<td>'+info['first_score']['scoretime']+'</td>' +
@@ -454,6 +462,8 @@
                                 '<td>'+info['first_score']['teamscore']+'</td>' +
                                 '<td>'+info['first_score']['scoretype']+'</td>' +
                                 '<td>'+info['match_winer']+'</td>' +
+                                '<td>'+info['u_home_score']+' / '+info['u_guest_score']+'</td>' +
+                                '<td>'+info['home_score']+' / '+info['guest_score']+'</td>' +
                                 '</tr>' +
                                 '</table></div></div><hr>';
                         }else{ //结果