Merge branch 'master' of http://git.bocai108.com:10180/aqm/sports_admin

app/Http/Controllers/Admin/SoccerNoteListController.php

@@ -164,7 +164,7 @@ class SoccerNoteListController extends Controller
     }
 
     /**
-     *单式注单结算
+     *单式注单首次结算
      */
     public function settlement(Req $req)
     {
@@ -174,10 +174,17 @@ class SoccerNoteListController extends Controller
         }
         $order = \App\Models\SportsNoteList::where('id', $id)->first();
         $order_ids = array($order->order_id);
-        //return $order_ids;
+        $match_id = $order->match_id;
+        $game_code = $order->game_code;
+        //return $match_id;
+        //判断输赢
+        $comendnotice = new \App\Models\Comendnotice();
+        $res = $comendnotice->addcomendnotice($match_id);
+        //结算
         $SettlementOrder = new SettlementOrder();
         $bet_type = 1;//单式注单
-        $data = $SettlementOrder->reSettlement($order_ids, $bet_type);
+        $settype = 1; //首次结算
+        $data = $SettlementOrder->reSettlement($order_ids,$bet_type,$settype,$game_code,$match_id);
         return $data;
     }
 
@@ -191,11 +198,18 @@ class SoccerNoteListController extends Controller
             return -1;
         }
         $order = \App\Models\SportsNoteList::where('id',$id)->first();
+        $match_id = $order->match_id;
+        $game_code = $order->game_code;
         $order_ids = array($order->order_id);
-        //return $order_ids;
+        //return $match_id;
+        //重新判断输赢
+        $comendnotice = new \App\Models\Comendnotice();
+        $res = $comendnotice->addcomendnotice($match_id);
+        //结算
         $SettlementOrder = new SettlementOrder();
         $bet_type = 1;//单式注单
-        $data = $SettlementOrder->reSettlement($order_ids,$bet_type);
+        $settype = 2; //重新结算
+        $data = $SettlementOrder->reSettlement($order_ids,$bet_type,$settype,$game_code,$match_id);
         return $data;
     }
 

app/Http/Controllers/Admin/SoccerStringNoteListController.php

@@ -35,8 +35,8 @@ class SoccerStringNoteListController extends Controller
         $dt->setLang('sportsnotelist');
         //$dt->addColsFields('id', array('templet' => '#userdetail', 'sort' => true, 'width' => 80));
         $dt->addColsFields('order_id', array('templet' => '#userdetail', 'sort' => true, 'width' => 200));
-        $dt->addColsFields('str_type', array('templet' => '#userdetail', 'sort' => false, 'width' => 90));
-        $dt->addColsFields('detail_content', array('sort' => false, 'width' => 150));
+        $dt->addColsFields('str_type', array('templet' => '#userdetail', 'sort' => false, 'width' => 70));
+        $dt->addColsFields('detail_content', array('sort' => false, 'width' => 140));
         $dt->addColsFields('money', array('templet' => '#userdetail', 'sort' => false, 'width' => 90));
         $dt->addColsFields('water_return', array('templet' => '#userdetail', 'sort' => false, 'width' => 90));
         $dt->addColsFields('prize_money', array('templet' => '#userdetail', 'sort' => false, 'width' => 120));
@@ -44,7 +44,7 @@ class SoccerStringNoteListController extends Controller
         $dt->addColsFields('money_time', array('templet' => '#userdetail', 'sort' => false, 'width' => 200));
         $dt->addColsFields('order_status', array('sort' => false, 'width' => 90));
         $dt->addColsFields('account_money', array('templet' => '#userdetail', 'sort' => false, 'width' => 230));
-        $dt->addColsFields('settle_status', array('sort' => false, 'width' => 80));
+        $dt->addColsFields('settle_status', array('sort' => false, 'width' => 120));
 //        if (checkRriv('/admin/SoccerStringNoteList/edit')) {
 //            $arr[] ='edit';
 //        }
@@ -197,12 +197,22 @@ class SoccerStringNoteListController extends Controller
             return -1;
         }
         $order = \App\Models\MoneyBuyStr::where('id', $id)->first();
+        $match = \App\Models\MoneyBuyMatch::where('batch_id',$order->batch_id)->where('bet_type','2')->get();
+        for($i=0;$i<count($match);$i++){
+            $match_id = $match[$i]->match_id;
+            $game_code = $match[$i]->game_code;
+            //判断输赢
+            //$match_ids[] = $match[$i]->match_id;
+            $comendnotice = new \App\Models\Comendnotice();
+            $res[] = $comendnotice->addcomendnotice($match_id);
+        }
         $order_ids = array($order->order_id);
-        //return $order_ids;
+        //return $match_ids;
+        //结算
         $SettlementOrder = new SettlementOrder();
         $bet_type = 2; //串关注单
-        $data = $SettlementOrder->reSettlement($order_ids, $bet_type);
-        //dd($SettlementOrder);
+        $settype = 1; //首次结算
+        $data = $SettlementOrder->reSettlement($order_ids,$bet_type,$settype,$game_code,$match_id);
         return $data;
     }
 
@@ -215,11 +225,21 @@ class SoccerStringNoteListController extends Controller
             return -1;
         }
         $order = \App\Models\MoneyBuyStr::where('id',$id)->first();
+        $match = \App\Models\MoneyBuyMatch::where('batch_id',$order->batch_id)->where('bet_type','2')->get();
+        for($i=0;$i<count($match);$i++){
+            $match_id = $match[$i]->match_id;
+            $game_code = $match[$i]->game_code;
+            //判断输赢
+            $comendnotice = new \App\Models\Comendnotice();
+            $res = $comendnotice->addcomendnotice($match_id);
+        }
         $order_ids = array($order->order_id);
         //return $order_ids;
+        //重新结算
         $SettlementOrder = new SettlementOrder();
         $bet_type = 2; //串关注单
-        $data = $SettlementOrder->reSettlement($order_ids,$bet_type);
+        $settype = 2; //重新结算
+        $data = $SettlementOrder->reSettlement($order_ids,$bet_type,$settype,$game_code,$match_id);
         return  $data;
     }
 

app/Http/Controllers/Admin/SportsbkController.php

@@ -38,7 +38,40 @@ class SportsbkController extends Controller {
 		$dt->enableCheckBox();
 		return view('admin/sportsbk/outcome', $dt->render($request));
 	}
+	
+	//查询赛事结果
+	function Matchresult(Req $req){
+		$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,
+		);
+		return $array;
+	}
+	
+	//结算
+	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');
+
+		$update = $this->addcomendnotice($ssid);
+		if($update['status']==1){
+			$SettlementOrder = new SettlementOrder();
+	        $SettlementOrder->reSettlement($str_ids, 2,$type,'lq',$ssid);//串式
+	        $data = $SettlementOrder->reSettlement($simplex_ids, 1,$type,'zq',$ssid);//单式注单
+	        return responseToJson($data);
+	    }else{
+	    	return responseToJson($update);
+	    }
+	}
+	
 	function info() {
 		$page = Request::has('page') ? Request::get('page') : '';
 		$list = Request::has('limit') ? Request::get('limit') : 1;

app/Http/Controllers/Admin/SportsfootController.php

@@ -71,8 +71,6 @@ class SportsfootController extends Controller {
 		$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);
 
@@ -127,11 +125,11 @@ class SportsfootController extends Controller {
 		}
 
 		$upapp = new \App\Models\SportsNoteList();
-        $data = $upapp->updatesimplex($match_id);//修改单式状态
+        $data = $upapp->updatesimplex($match_id,'zq');//修改单式状态
 
         //单式撤单返现
         $newapp = new \App\Models\MoneyBuyMatch();
-		$all = $newapp->allsimplexorder($match_id);
+		$all = $newapp->allsimplexorder($match_id,'zq');
         for ($i=0; $i < count($all); $i++) { 
 	        $appgx = new \App\Lib\Settlement\SettlementOrder();
 	        $appgx->insertData($all[$i]['order_id'], $all[$i]['money'], $all[$i]['account_identity'], '1', 'zq', $all[$i]['info_identity'], $all[$i]['money'],$all[$i]['match_id']);

app/Models/Comendnotice.php

@@ -14,5 +14,30 @@ class Comendnotice extends BaseModel {
 
     protected $table = 'comendnotice';
 
+    //添加赛事结束纪录
+    function addcomendnotice($match_id){
+        $data = \App\Models\Comendnotice::where(['match_id'=>$match_id,'game_code'=>'zq'])->first();
+        if(!$data){
+            $model = new \App\Models\Comendnotice();
+            $model->status = 0;//联赛id
+            $model->game_code = 'zq';
+            $model->match_id = $match_id;//赛事id
+            $model->ctime = date('Y-m-d H:i:s');
+            $model->save();
+
+            $newapp = new \App\Lib\Settlement\SettlementWinFail();
+            $ret = $newapp->doRun($model->id);
+        }else{
+            $newapp = new \App\Lib\Settlement\SettlementWinFail();
+            \App\Models\Comendnotice::where(['match_id'=>$match_id,'game_code'=>'zq'])->update(['status'=>0]);
+            $ret = $newapp->doRun($data->toArray()['id']);
+            $ret2 =$data->toArray()['id'];
+            if ($ret2['status']==1){
+                \App\Models\Comendnotice::where(['match_id'=>$match_id,'game_code'=>'zq'])->update(['status'=>4]);
+            }
+        }
+        return $ret;
+    }
+
 
 }

app/Models/MoneyBuyStr.php

@@ -31,6 +31,15 @@ class MoneyBuyStr extends BaseModel {
             return -2021052003; //
         }
 
+        //足球赛事
+        $zqmatch =  \App\Models\SportsSoccer::where('status','<>','4')->where('status','<>','6')->get();
+        //篮球赛事
+        $lqmatch =  \App\Models\SportsBasket::where('status','<>','4')->where('status','<>','6')->get();
+        //网球赛事
+        $wqmatch =  \App\Models\SportsTennis::where('status','<>','4')->where('status','<>','6')->get();
+        //棒球赛事
+        $bqmatch =  \App\Models\SportsBase::where('status','<>','4')->where('status','<>','6')->get();
+
         //反水
         $water_return_money = \App\Models\Money_details::where('trade_type','7')->get();
 
@@ -39,6 +48,36 @@ class MoneyBuyStr extends BaseModel {
 
         //订单投注的玩法
         $content = \App\Models\MoneyBuyMatch::where('bet_type','2')->get();
+        for($c=0;$c<count($content);$c++) {
+            if ($content[$c]->game_code == 'zq') {
+                for ($d = 0; $d < count($zqmatch); $d++) {
+                    if ($content[$c]->match_id == $zqmatch[$d]->match_id) {
+                        $content[$c]->match_status = $zqmatch[$d]->status;
+                    }
+                }
+            }
+            if ($content[$c]->game_code == 'lq') {
+                for ($d = 0; $d < count($lqmatch); $d++) {
+                    if ($content[$c]->match_id == $lqmatch[$d]->match_id) {
+                        $content[$c]->match_status = $lqmatch[$d]->status;
+                    }
+                }
+            }
+            if ($content[$c]->game_code == 'wq') {
+                for ($d = 0; $d < count($wqmatch); $d++) {
+                    if ($content[$c]->match_id == $wqmatch[$d]->match_id) {
+                        $content[$c]->match_status = $wqmatch[$d]->status;
+                    }
+                }
+            }
+            if ($content[$c]->game_code == 'bq') {
+                for ($d = 0; $d < count($bqmatch); $d++) {
+                    if ($content[$c]->match_id == $bqmatch[$d]->match_id) {
+                        $content[$c]->match_status = $bqmatch[$d]->status;
+                    }
+                }
+            }
+        }
 
         for($i=0;$i<count($data);$i++){
             if($data[$i]->status==1 && $data[$i]->settle_status==1){
@@ -103,25 +142,28 @@ class MoneyBuyStr extends BaseModel {
                 }
             }
 
-
             $data[$i]->settle_status = $data[$i]->settle_status;
 
-//            if($data[$i]->settle_status == '未结算'){
-//                $result = array();
-//                for($j=0;$j<count($content);$j++){
-//                    if($data[$i]->batch_id == $content[$j]->batch_id){
-//                        $result[] = $content[$j]->result;
-//                    }
-//                }
-//                if(in_array(0,$result)){
-//                    $data[$i]->settle_status = $data[$i]->settle_status.'<br><a class="layui-btn layui-btn-sm resettlement settlement" lay-event="detail" pid="id" lay-filter = "resettlement" uri="" href="javascript:void(0)" style="background-color: grey;"> 结算 </a>';
-//                }else{
-//                    $data[$i]->settle_status = $data[$i]->settle_status.'<br><a class="layui-btn layui-btn-sm settlement" lay-event="detail" pid="id" lay-filter = "resettlement" uri="/admin/SoccerStringNoteList/settlement/?id=" href="javascript:settlement(\'/admin/SoccerStringNoteList/settlement/?id='.$data[$i]->id.'\');"> 结算 </a>';
-//                }
-//
-//            }else if($data[$i]->settle_status == '已结算'){
-//                $data[$i]->settle_status = $data[$i]->settle_status.'<br><a class="layui-btn layui-btn-sm resettlement settlement" lay-event="detail" pid="id" lay-filter = "resettlement" uri="" href="javascript:void(0)" style="background-color: #FFAF60;"> 已结算 </a>';
-//            }
+            if($data[$i]->status == 1){
+                if($data[$i]->settle_status == '未结算'){
+                    $match_status = array();
+                    for($j=0;$j<count($content);$j++){
+                        if($data[$i]->batch_id == $content[$j]->batch_id){
+                            $match_status[] = $content[$j]->match_status;
+                        }
+                    }
+                    if(in_array(0,$match_status) || in_array(1,$match_status)){
+                        $data[$i]->settle_status = $data[$i]->settle_status.'<br><a class="layui-btn layui-btn-sm resettlement settlement" lay-event="detail" pid="id" lay-filter = "resettlement" uri="" href="javascript:void(0)" style="background-color: grey;"> 结算 </a>';
+                    }else{
+                        $data[$i]->settle_status = $data[$i]->settle_status.'<br><a class="layui-btn layui-btn-sm settlement" lay-event="detail" pid="id" lay-filter = "resettlement" uri="/admin/SoccerStringNoteList/settlement/?id=" href="javascript:settlement(\'/admin/SoccerStringNoteList/settlement/?id='.$data[$i]->id.'\');"> 结算 </a>';
+                    }
+
+                }else if($data[$i]->settle_status == '已结算'){
+                    $data[$i]->settle_status = $data[$i]->settle_status.'<br><a class="layui-btn layui-btn-sm settlement" lay-event="detail" pid="id" lay-filter = "resettlement" uri="/admin/SoccerStringNoteList/resettlement/?id=" href="javascript:resettlement(\'/admin/SoccerStringNoteList/resettlement/?id='.$data[$i]->id.'\');">重新结算 </a>';
+                }
+            }else{
+                $data[$i]->settle_status = $data[$i]->settle_status.'<br><a class="layui-btn layui-btn-sm resettlement settlement" lay-event="detail" pid="id" lay-filter = "resettlement" uri="" href="javascript:void(0)" style="background-color: grey;"> 结算 </a>';
+            }
 
         }
         return $data->toArray();
@@ -197,10 +239,20 @@ class MoneyBuyStr extends BaseModel {
                 }
             }
 
-            if($data[$i]->status == 0){
-                $data[$i]->status = '未结算';
-            }else if($data[$i]->status == 1){
+            if($league->status == 0){
+                $data[$i]->status = '未开始';
+            }else if($league->status == 1){
+                $data[$i]->status = '正在进行';
+            }else if($league->status == 2){
+                $data[$i]->status = '已结束';
+            }else if($league->status == 3){
                 $data[$i]->status = '已结算';
+            }else if($league->status == 4){
+                $data[$i]->status = '已作废';
+            }else if($league->status == 5){
+                $data[$i]->status = '未结算';
+            }else if($league->status == 6){
+                $data[$i]->status = '已取消';
             }
 
             if($data[$i]->result == -1){

app/Models/SportsNoteList.php

@@ -17,7 +17,7 @@ class SportsNoteList extends BaseModel {
             ->join('money_details','money_details.info_identity','=','money_buy_simplex.info_identity')
             ->join('st_'.$type.'_competition','st_'.$type.'_competition.match_id','=','money_buy_simplex.match_id')
             ->join('st_'.$type.'_league','st_'.$type.'_competition.lg_id','=','st_'.$type.'_league.lg_id')
-            ->select('money_buy_simplex.id','money_buy_simplex.account_name','money_buy_simplex.account_identity','money_buy_simplex.order_id','money_buy_simplex.money','money_buy_simplex.prize_money','money_buy_simplex.status','money_buy_simplex.money_time','money_buy_simplex.settle_status','money_buy_simplex.gain_money','money_buy_simplex.game_code','money_buy_simplex.match_id','money_buy_simplex.game_status','st_'.$type.'_competition.home_team','st_'.$type.'_competition.guest_team','st_'.$type.'_competition.match_date','st_'.$type.'_competition.match_time','st_'.$type.'_competition.lg_id','money_details.money_cash','money_buy_simplex.batch_id','st_'.$type.'_league.name_chinese','st_'.$type.'_league.last_time')
+            ->select('money_buy_simplex.id','money_buy_simplex.account_name','money_buy_simplex.account_identity','money_buy_simplex.order_id','money_buy_simplex.money','money_buy_simplex.prize_money','money_buy_simplex.status','money_buy_simplex.money_time','money_buy_simplex.settle_status','money_buy_simplex.gain_money','money_buy_simplex.game_code','money_buy_simplex.match_id','money_buy_simplex.game_status','st_'.$type.'_competition.home_team','st_'.$type.'_competition.guest_team','st_'.$type.'_competition.match_date','st_'.$type.'_competition.match_time','st_'.$type.'_competition.lg_id','st_'.$type.'_competition.status as match_status','money_details.money_cash','money_buy_simplex.batch_id','st_'.$type.'_league.name_chinese','st_'.$type.'_league.last_time')
             ->where($where)
             ->orderby('money_buy_simplex.money_time','desc')
             ->paginate ($list);
@@ -145,15 +145,6 @@ class SportsNoteList extends BaseModel {
                         $content[$b]->condition = '';
                     }
 
-//                    if($content[$b]->result == '0'){
-//                        $data[$i]->str = 1;
-//                    }else{
-//                        if($data[$i]->game_status == '未处理'){
-//                            $data[$i]->str = 2;
-//                        }else{
-//                            $data[$i]->str = 3;
-//                        }
-//                    }
                     $data[$i]->game_status = $data[$i]->game_status;
 
                     //投注详情
@@ -188,15 +179,21 @@ class SportsNoteList extends BaseModel {
                     }
                 }
             }
-//            if($data[$i]->str == 1){
-//                $data[$i]->game_status = $data[$i]->game_status.'<br><a class="layui-btn layui-btn-sm audit" lay-event="detail" pid="id" uri="" href="javascript:void(0)" style="background-color: grey;"> 结算 </a>';
-//            }
-//            if($data[$i]->str == 2){
-//                $data[$i]->game_status = $data[$i]->game_status.'<br><a class="layui-btn layui-btn-sm settlement" lay-event="detail" pid="id" uri="/admin/SoccerNoteList/settlement/?id=" href="javascript:settlement(\'/admin/SoccerNoteList/settlement/?id='.$data[$i]->id.'\');"> 结算 </a>';
-//            }
-//            if($data[$i]->str == 3){
-//                $data[$i]->game_status = $data[$i]->game_status.'<br><a class="layui-btn layui-btn-sm resettlement" lay-event="detail" pid="id" uri="" href="javascript:void(0)" style="background-color: #FFAF60;"> 已结算 </a>';
-//            }
+
+            if($data[$i]->status == 1){
+                if($data[$i]->match_status == 0 || $data[$i]->match_status == 1){
+                    $data[$i]->game_status = $data[$i]->game_status.'<br><a class="layui-btn layui-btn-sm audit" lay-event="detail" pid="id" uri="" href="javascript:void(0)" style="background-color: grey;"> 结算 </a>';
+                }
+                if($data[$i]->match_status == 2 || $data[$i]->match_status == 5){
+                    $data[$i]->game_status = $data[$i]->game_status.'<br><a class="layui-btn layui-btn-sm settlement" lay-event="detail" pid="id" uri="/admin/SoccerNoteList/settlement/?id=" href="javascript:settlement(\'/admin/SoccerNoteList/settlement/?id='.$data[$i]->id.'\');"> 结算 </a>';
+                }
+                if($data[$i]->match_status == 3){
+                    $data[$i]->game_status = $data[$i]->game_status.'<br><a class="layui-btn layui-btn-sm resettlement" lay-event="detail" pid="id" uri="/admin/SoccerNoteList/resettlement/?id=" href="javascript:resettlement(\'/admin/SoccerNoteList/resettlement/?id='.$data[$i]->id.'\');"> 重新结算 </a>';
+                }
+            }else{
+                $data[$i]->game_status = $data[$i]->game_status.'<br><a class="layui-btn layui-btn-sm audit" lay-event="detail" pid="id" uri="" href="javascript:void(0)" style="background-color: grey;"> 结算 </a>';
+            }
+
             $data[$i]->content = $data[$i]->content1.$data[$i]->content;
 
         }
@@ -250,15 +247,16 @@ class SportsNoteList extends BaseModel {
         return $data;
     }
 
-     //修改赛事下的所有单式下注 3199308
-    function updatesimplex($ssid){
+    //修改赛事下的所有单式下注 3199308
+    function updatesimplex($ssid,$code){
         $newapp = new \App\Models\MoneyBuyMatch();
-        $data = $newapp->allsimplexorder($ssid);
+        $data = $newapp->allsimplexorder($ssid,$code);
         if($data){
             for ($i=0; $i < count($data); $i++) { 
                 $the = array(
                     'status' => 2,
                     'game_status' => 3,
+                    'game_code' =>$code,
                 );
                 $res = $this->where('order_id',$data[$i]['order_id'])->update($the);
             }

resources/lang/zh-cn/status.php

@@ -341,6 +341,8 @@ return array(
 			'0' => '未开始',
 			'1' => '进行中',
 			'2' => '已结束',
+			'3' => '已结算',
+			'4' => '已作废',
 		),
 	),
 	'league_status' => array(

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

@@ -147,6 +147,12 @@
       @{{#} }}
       @{{#if(d.status==2){ }}
         <span>已结束</span>
+      @{{#} }}
+	  @{{#if(d.status==3){ }}
+        <span>已结算</span>
+      @{{#} }}
+	  @{{#if(d.status==4){ }}
+        <span>已作废</span>
       @{{#} }}
     </script>
 
@@ -283,8 +289,6 @@
                     document.getElementById("firstscore").value=data.newapp.first_score;
                     document.getElementById("lastscore").value=data.newapp.last_score;
                     document.getElementById("matchwiner").value=data.newapp.match_winer;
-                    document.getElementById("uhomescore").value=data.newapp.u_home_score;
-                    document.getElementById("uguestscore").value=data.newapp.u_guest_score;
                     document.getElementById("homeallcard").value=data.penalty_card.home;
                     document.getElementById("guestallcard").value=data.penalty_card.guest;
                     document.getElementById("homehalfcard").value=data.penalty_card.home_half;
@@ -294,7 +298,7 @@
                     document.getElementById("homehalfcorner").value=data.corner_ball.home_half;
                     document.getElementById("guesthalfcorner").value=data.corner_ball.guest_half;
                 }
-            })
+            }) 
 
             //获取弹窗得div
             var modal = document.getElementById('myModal');
@@ -330,14 +334,24 @@
                 if (event.target == modal) modal.style.display = "none";
             }
         }
-
+		
+		function requests(match_id){
+			$.ajax({
+                type: 'POST',
+                dataType: 'json',
+                url: '/admin/Sportsfoot/Matchresult',
+                data: {match_id:match_id},
+                success: function(data) {
+					return data;
+                }
+            })
+		}
+		
         function buttonClick(){
             var matchid = $("#matchid").val();
             var firstscore = $("#firstscore").val();
             var lastscore = $("#lastscore").val();
             var matchwiner = $("#matchwiner").val();
-            var uhomescore = $("#uhomescore").val();
-            var uguestscore = $("#uguestscore").val();
             var homeallcard = $("#homeallcard").val();
             var guestallcard = $("#guestallcard").val();
             var homehalfcard = $("#homehalfcard").val();
@@ -346,12 +360,16 @@
             var guestallcorner = $("#guestallcorner").val();
             var homehalfcorner = $("#homehalfcorner").val();
             var guesthalfcorner = $("#guesthalfcorner").val();
-
+			
+			requests = requests(matchid);
+			var allnum = requests.newapp['home_score']+requests.newapp['guest_score'];
+			alert(allnum);
+			
             $.ajax({
                 type: 'POST',
                 dataType: 'json',
                 url: '/admin/Sportsfoot/addend',
-                data: {matchid:matchid,firstscore:firstscore,lastscore:lastscore,matchwiner:matchwiner,uhomescore:uhomescore,uguestscore:uguestscore,homeallcard:homeallcard,guestallcard:guestallcard,homehalfcard:homehalfcard,guesthalfcard:guesthalfcard,homeallcorner:homeallcorner,guestallcorner:guestallcorner,homehalfcorner:homehalfcorner,guesthalfcorner:guesthalfcorner},
+                data: {matchid:matchid,firstscore:firstscore,lastscore:lastscore,matchwiner:matchwiner,homeallcard:homeallcard,guestallcard:guestallcard,homehalfcard:homehalfcard,guesthalfcard:guesthalfcard,homeallcorner:homeallcorner,guestallcorner:guestallcorner,homehalfcorner:homehalfcorner,guesthalfcorner:guesthalfcorner},
                 success: function(data) {
                     
                     if(data.status==1){
@@ -587,12 +605,6 @@ $('.lay-btn-diy').on('click', function(){
                         <div style="display: flex;">
                             <li> 获 &nbsp;胜&nbsp; 球&nbsp; 队&nbsp;：</li><input type="text" id="matchwiner" name="matchwiner" value="">
                         </div>
-                        <div style="display: flex;">
-                            <li>上主队进球数：</li><input type="text" id="uhomescore" name="uhomescore" value=""  autocomplete="off">
-                        </div>
-                        <div style="display: flex;">
-                            <li>上客队进球数：</li><input type="text" id="uguestscore" name="uguestscore" value="" autocomplete="off">
-                        </div>
                         <div style="display: flex;">
                             <li>主队全场角球：</li><input type="text" id="homeallcorner" name="homeallcorner" value="" autocomplete="off">
                         </div>