追加推送 结算测试

app/Http/Controllers/Admin/SportsbqController.php

@@ -24,12 +24,13 @@ class SportsbqController extends Controller {
 		$dt = \App\Lib\DataTable\DataTable::init();
         $dt->setDataSource('/admin/Sportsbq/info');
         $dt->setLang('Sportsbq');
-        $dt->addColsFields('newtime', array('templet' => '#home_team', 'sort' => false, 'width' => 200));
+        $dt->addColsFields('newtime', array('templet' => '#newtime', 'sort' => false, 'width' => 200));
+        $dt->addColsFields('totime', array('templet' => '#totime', 'sort' => false, 'width' => 200));
         $dt->addColsFields('home_team', array('templet' => '#home_team', 'sort' => false, 'width' => 80));
         $dt->addColsFields('guest_team', array('templet' => '#guest_team', 'sort' => false, 'width' => 80));
-        $dt->addColsFields('dsnum', array('templet' => '#home_rate', 'sort' => false, 'width' => 80));
+        $dt->addColsFields('dsnum', array('templet' => '#dsnum', 'sort' => false, 'width' => 80));
         $dt->addColsFields('csnum', array('templet' => '#home_rate', 'sort' => false, 'width' => 80));
-        $dt->addColsFields('match_score', array('templet' => '#match_score', 'sort' => false, 'width' => 80));
+        $dt->addColsFields('match_score', array('templet' => '#match_score', 'sort' => false, 'width' => 200));
         $dt->addColsFields('statusmatch', array('templet' => '#statusmatch', 'sort' => false, 'width' => 80));
         $dt->addColsFields('operation', array('templet' => '#operation', 'sort' => false, 'width' => 300));
 		return view('admin.Sportsbq/outcome', $dt->render($request));
@@ -55,7 +56,7 @@ class SportsbqController extends Controller {
 	    if (!empty($end_time)) {
 	        $end_time = date('Y-m-d H:i:s', strtotime($end_time));
 	        $where[] = array('st_bq_result.start_time', '<', $end_time);
-	    }//var_dump($where);die;
+	    }
 		$newapp = new \App\Models\Stbqresult();
         $data = $newapp->getinfo($list, $page, $where);
         
@@ -122,9 +123,9 @@ class SportsbqController extends Controller {
 		$newapp = \App\Models\Stbqresult::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,
+			// 'corner_ball' => json_decode($newapp['corner_ball'],true),
+			// 'penalty_card' => json_decode($newapp['penalty_card'],true),
+			'bqresult' => $newapp,
 		);
 		return $array;
 	}
@@ -139,50 +140,34 @@ class SportsbqController extends Controller {
 	function addend(Req $req){
 		$match_id = $req->matchid;
 		$model = \App\Models\Stbqresult::where('match_id', $match_id)->first();
-
-		$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->penalty_card = json_encode($penaltycard);
-		$model->corner_ball = json_encode($cornerball);
-
+		$model->first_score = $req->firstscoreplayer?$req->firstscoreplayer:0;
+		$model->last_score = $req->lastscoreplayer?$req->lastscoreplayer:0;
+		$model->match_winer = $req->matchwinerplayer?$req->matchwinerplayer:0;
         $model->save();
         return responseToJson(1);
 	}
 
 	//更新赛事比分
-	function updatenum(Req $req){
-		$type = $req->type;
-		$id = $req->id;
+	function updatascore(Req $req){
+		$only = $req->only;
 		$num = $req->num;
 		$match_id = $req->match_id;
 		$newapp = new \App\Models\Stbqresult();
-		
-		if($type==1){
+
+		// $data = array();
+		// $data['update_time'] = data('Y-m-d H:i:s');//更新时间
+		if($only==1){
 			$data['u_home_score'] = $num;
-			$res = $newapp->updateInfo($data,$id);//联赛id
-		}else if($type==2){
+			$res = $newapp->updateInfo($data,$match_id);//联赛id
+		}else if($only==2){
 			$data['u_guest_score'] = $num;
-			$res = $newapp->updateInfo($data,$id);//联赛id
-		}else if($type==3){
+			$res = $newapp->updateInfo($data,$match_id);//联赛id
+		}else if($only==3){
 			$data['home_score'] = $num;
-			$res = $newapp->updateInfo($data,$id);//联赛id
+			$res = $newapp->updateInfo($data,$match_id);//联赛id
 		}else{
 			$data['guest_score'] = $num;
-			$res = $newapp->updateInfo($data,$id);//联赛id
+			$res = $newapp->updateInfo($data,$match_id);//联赛id
 		}
 		$addnew = new \App\Models\Comendnotice();
 		$addnew->addcomendnotice($match_id,'bq');

app/Models/Stbqresult.php

@@ -14,9 +14,9 @@ class Stbqresult extends BaseModel {
     function getinfo($list = 10, $page, $where = '')
     {
     	if (is_array ($where) && count ($where) > 0) {
-            $data = $this->join('st_bq_league','st_bq_result.lg_id','=','st_bq_league.id')->join('st_zq_competition','st_zq_competition.id','=','st_bq_result.match_id')->select($this->table.'.id',$this->table.'.home_team',$this->table.'.guest_team',$this->table.'.match_id','st_bq_result.guest_team','st_bq_result.home_rate','st_bq_result.guest_rate','st_bq_result.first_score','st_bq_result.status','st_bq_result.last_score','st_bq_result.match_score','st_bq_result.match_winer','st_bq_result.update_time','st_zq_competition.match_time','st_bq_result.match_process',$this->table.'.home_score',$this->table.'.guest_score',$this->table.'.u_guest_score',$this->table.'.u_home_score',$this->table.'.start_time','st_bq_league.name_chinese as saisname')->orderby('st_bq_result.id','desc')->where($where)->paginate ($list);
+            $data = $this->join('st_bq_league','st_bq_result.lg_id','=','st_bq_league.id')->join('st_bq_competition','st_bq_competition.id','=','st_bq_result.match_id')->select($this->table.'.id',$this->table.'.home_team',$this->table.'.guest_team',$this->table.'.match_id','st_bq_result.guest_team','st_bq_result.home_rate','st_bq_result.guest_rate','st_bq_result.first_score','st_bq_result.status','st_bq_result.last_score','st_bq_result.match_score','st_bq_result.match_winer','st_bq_result.update_time','st_bq_competition.match_time','st_bq_result.match_process',$this->table.'.home_score',$this->table.'.guest_score',$this->table.'.u_guest_score',$this->table.'.u_home_score',$this->table.'.start_time','st_bq_league.name_chinese as saisname')->orderby('st_bq_result.id','desc')->where($where)->paginate ($list);
         } else { 
-        	$data = $this->join('st_bq_league','st_bq_result.lg_id','=','st_bq_league.id')->join('st_zq_competition','st_zq_competition.id','=','st_bq_result.match_id')->select($this->table.'.id',$this->table.'.home_team',$this->table.'.guest_team',$this->table.'.match_id','st_bq_result.guest_team','st_bq_result.home_rate','st_bq_result.guest_rate','st_bq_result.first_score','st_bq_result.status','st_bq_result.last_score','st_bq_result.match_score','st_bq_result.match_winer','st_bq_result.update_time','st_zq_competition.match_time','st_bq_result.match_process',$this->table.'.home_score',$this->table.'.guest_score',$this->table.'.u_guest_score',$this->table.'.u_home_score',$this->table.'.start_time','st_bq_league.name_chinese as saisname')->orderby('st_bq_result.id','desc')->paginate ($list);
+        	$data = $this->join('st_bq_league','st_bq_result.lg_id','=','st_bq_league.id')->join('st_bq_competition','st_bq_competition.id','=','st_bq_result.match_id')->select($this->table.'.id',$this->table.'.home_team',$this->table.'.guest_team',$this->table.'.match_id','st_bq_result.guest_team','st_bq_result.home_rate','st_bq_result.guest_rate','st_bq_result.first_score','st_bq_result.status','st_bq_result.last_score','st_bq_result.match_score','st_bq_result.match_winer','st_bq_result.update_time','st_bq_competition.match_time','st_bq_result.match_process',$this->table.'.home_score',$this->table.'.guest_score',$this->table.'.u_guest_score',$this->table.'.u_home_score',$this->table.'.start_time','st_bq_league.name_chinese as saisname')->orderby('st_bq_result.id','desc')->paginate ($list);
         }
         return $data->toArray ();
     }
@@ -37,6 +37,16 @@ class Stbqresult extends BaseModel {
             return -7020050022;//更新失败
         }
         return 1;
-    }    
+    } 
+ 
+    //更新
+    function updateInfo($data, $match_id)
+    {
+        $res = $this->where ('match_id', $match_id)->update ($data);
+        if (!$res) {
+            return -7010101202; //更新失败
+        }
+        return 1;
+    }
 
 }

resources/lang/zh-cn/Sportsbq.php

@@ -29,5 +29,6 @@ return array(
     'csnum' => '串式注单',
     'statusmatch' => '比赛状态',
     'operation' => '操作',
+    'totime' => '时间',
 
 );

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

@@ -121,7 +121,31 @@
     }
 </style>
     
-    <!-- match_score -->
+    <script type="text/html" id="newtime">
+      @{{#if(d.match_id!=null){ }}
+        <span>@{{ d.match_id}}</span>
+      @{{#} }}<br>
+      @{{#if(d.saisname!=null){ }}
+        <span>@{{ d.saisname}}</span>
+      @{{#} }}
+    </script>
+
+    <script type="text/html" id="totime">
+      @{{#if(d.start_time!=null){ }}
+        <span>@{{ d.start_time}}</span>
+      @{{#} }}
+    </script>
+
+    <script type="text/html" id="match_score">
+            <input type="text" style="width:30px;heigth:20px" id="u_home_score@{{d.id}}" name="u_home_score" value="@{{d.u_home_score}}" onchange="teamscore(1, event.target.value,@{{d.match_id}})"> 
+            <input type="text" style="width:30px;heigth:20px" id="u_guest_score@{{d.id}}" name="u_guest_score" value="@{{d.u_guest_score}}" onchange="teamscore(2, event.target.value,@{{d.match_id}})"> / 
+            <input type="text" style="width:30px;heigth:20px" id="home_score@{{d.id}}" name="home_score" value="@{{d.home_score}}" onchange="teamscore(3, event.target.value,@{{d.match_id}})">
+            <input type="text" style="width:30px;heigth:20px" id="guest_score@{{d.id}}" name="guest_score" value="@{{d.guest_score}}" onchange="teamscore(4, event.target.value,@{{d.match_id}})">
+    </script>
+
+    <script type="text/html" id="dsnum">
+        <span><a href="/admin/SoccerNoteList/notelist?type=bq&match_id=@{{d.match_id}}"> 单式</a></span>
+    </script>
 
     <script type="text/html" id="statusmatch">
     @{{#if(d.status==0){ }}
@@ -230,7 +254,23 @@
                 <div class="modal-body">
                     <p style="text-align:left;color:#5f7788;">请认真填写赛事结果,将会按照改结果结算</p><br>
                     <div style="text-align:left;">
-                        <div style="display:flex;heigth:20px">
+                        <div style="display: flex;">
+                            <li>最先进球球队：</li>
+                            <select name="firstscoreplayer" id="firstscoreplayer">
+                            </select>
+                        </div>
+                        <div style="display: flex;">
+                            <li>最后进球球队：</li>
+                            <select name="lastscoreplayer" id="lastscoreplayer">
+                            </select>
+                        </div>
+                        <div style="display: flex;">
+                            <li>获&nbsp;&nbsp;胜&nbsp;&nbsp;&nbsp;球&nbsp;&nbsp;队：</li>
+                            <select name="matchwinerplayer" id="matchwinerplayer">
+                            </select>
+                        </div>
+                        
+                        <!-- <div style="display:flex;heigth:20px">
                             <li style="width: 110px;">第一局比分</li>
                             <div>
                                 <input type="text" style="width:50px;heigth:15px;" id="u_home_score@{{d.id}}" name="u_home_score" value="@{{d.u_home_score}}" onchange="inputFunc(@{{d.id}}, event.target.value,@{{d.match_id}})"> - 
@@ -278,7 +318,7 @@
                                  <input type="text" style="width:50px;heigth:15px" id="u_home_score@{{d.id}}" name="u_home_score" value="@{{d.u_home_score}}" onchange="inputFunc(@{{d.id}}, event.target.value,@{{d.match_id}})"> - 
                                 <input type="text" style="width:50px;heigth:15px" id="u_home_score@{{d.id}}" name="u_home_score" value="@{{d.u_home_score}}" onchange="inputFunc(@{{d.id}}, event.target.value,@{{d.match_id}})"> 
                             </div>
-                        </div>
+                        </div> -->
                     </div>
                 </div>
                 <div class="modal-footer">
@@ -306,30 +346,51 @@
 
         function addResult($match_id){
             $(":input",$("#myModal")).each(function(i){  $(this).val('');});
-            var match_id = $match_id;//alert(match_id);
+            var match_id = $match_id;
             document.getElementById("matchid").value=$match_id;//赋值个弹窗
             
             $.ajax({
                 type: 'POST',
                 dataType: 'json',
-                url: '/admin/Sportsfoot/Matchresult',
+                url: '/admin/Sportsbq/Matchresult',
                 data: {match_id:match_id},
                 success: function(data) {
-                    document.getElementById("matchwiner").value=data.newapp.match_winer;
-                    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;
-                    document.getElementById("guesthalfcard").value=data.penalty_card.guest_half;
-                    document.getElementById("homeallcorner").value=data.corner_ball.home;
-                    document.getElementById("guestallcorner").value=data.corner_ball.guest;
-                    document.getElementById("homehalfcorner").value=data.corner_ball.home_half;
-                    document.getElementById("guesthalfcorner").value=data.corner_ball.guest_half;
-
-                    addqd = "<option value='' selected=''>请选择最后进球</option><option value=" +data.newapp.home_team + ">" + data.newapp.home_team + "</option><option value=" +data.newapp.guest_team + ">" + data.newapp.guest_team + "</option>";
-                    $("#addqd").html(addqd);
-
-                    addzd = "<option value='' selected=''>请选择最后进球</option><option value=" + data.newapp.home_team + ">" + data.newapp.home_team + "</option><option value=" + data.newapp.guest_team + ">" + data.newapp.guest_team + "</option>";
-                    $("#addzd").html(addzd);
+                    // document.getElementById("matchwiner").value=data.newapp.match_winer;
+                    // 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;
+                    // document.getElementById("guesthalfcard").value=data.penalty_card.guest_half;
+                    // document.getElementById("homeallcorner").value=data.corner_ball.home;
+                    // document.getElementById("guestallcorner").value=data.corner_ball.guest;
+                    // document.getElementById("homehalfcorner").value=data.corner_ball.home_half;
+                    // document.getElementById("guesthalfcorner").value=data.corner_ball.guest_half;
+
+                    firstscoreplayer = "<option value='"+data.bqresult.first_score+"' selected=''>";
+                    if (data.bqresult.first_score != 0){
+                        firstscoreplayer += data.bqresult.first_score;
+                    }else{
+                        firstscoreplayer += '请选择最先进球';
+                    }
+                    firstscoreplayer += "</option><option value=" + data.bqresult.home_team + ">" + data.bqresult.home_team + "</option><option value=" + data.bqresult.guest_team + ">" + data.bqresult.guest_team + "</option>";
+                    $("#firstscoreplayer").html(firstscoreplayer);
+
+                    lastscoreplayer = "<option value='"+data.bqresult.last_score+"' selected=''>";
+                    if (data.bqresult.last_score != 0){
+                        lastscoreplayer += data.bqresult.last_score;
+                    }else{
+                        lastscoreplayer += '请选择最后进球';
+                    }
+                    lastscoreplayer += "</option><option value=" + data.bqresult.home_team + ">" + data.bqresult.home_team + "</option><option value=" + data.bqresult.guest_team + ">" + data.bqresult.guest_team + "</option>";
+                    $("#lastscoreplayer").html(lastscoreplayer);
+
+                    matchwinerplayer = "<option value='"+data.bqresult.match_winer+"' selected=''>";
+                    if (data.bqresult.match_winer  != 0){
+                        matchwinerplayer += data.bqresult.match_winer;
+                    }else{
+                        matchwinerplayer += '请选择最后胜利球队';
+                    }
+                    matchwinerplayer += "</option><option value=" + data.bqresult.home_team + ">" + data.bqresult.home_team + "</option><option value=" + data.bqresult.guest_team + ">" + data.bqresult.guest_team + "</option>";
+                    $("#matchwinerplayer").html(matchwinerplayer);
                 }
             }) 
 
@@ -370,32 +431,23 @@
         
         function buttonClick(){
             var matchid = $("#matchid").val();
-            var firstscore = $("#firstscore").val();
-            var lastscore = $("#lastscore").val();
-            var matchwiner = $("#matchwiner").val();
-            var homeallcard = $("#homeallcard").val();
-            var guestallcard = $("#guestallcard").val();
-            var homehalfcard = $("#homehalfcard").val();
-            var guesthalfcard = $("#guesthalfcard").val();
-            var homeallcorner = $("#homeallcorner").val();
-            var guestallcorner = $("#guestallcorner").val();
-            var homehalfcorner = $("#homehalfcorner").val();
-            var guesthalfcorner = $("#guesthalfcorner").val();
-            var reg = /^[0-99]\d*$/;
+            var firstscoreplayer = $("#firstscoreplayer").val();
+            var lastscoreplayer = $("#lastscoreplayer").val();
+            var matchwinerplayer = $("#matchwinerplayer").val();
           
             $.ajax({
                 type: 'POST',
                 dataType: 'json',
-                url: '/admin/Sportsfoot/onlyresult',
+                url: '/admin/Sportsbq/onlyresult',
                 data: {matchid:matchid},
                 success: function(data) {
                     var allnum = data.home_score+ data.guest_score;
                    
                     if(allnum>0){
-                        if(firstscore.length==0){ 
+                        if(firstscoreplayer.length==0){ 
                             alert("请输入最先进球");return;
                         }
-                        if(lastscore.length==0){ 
+                        if(lastscoreplayer.length==0){ 
                             alert("请输入最后进球");return;
                         }
                     }
@@ -403,11 +455,10 @@
                     $.ajax({
                             type: 'POST',
                             dataType: 'json',
-                            url: '/admin/Sportsfoot/addend',
-                            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},
+                            url: '/admin/Sportsbq/addend',
+                            data: {matchid:matchid,firstscoreplayer:firstscoreplayer,lastscoreplayer:lastscoreplayer,matchwinerplayer:matchwinerplayer},
                             success: function(data) {
                                 
-                                
                                     layer.msg(data.msg);
                                     location. reload()//刷新当前页面
                                 
@@ -463,7 +514,6 @@
                 url: '/admin/Sportsbq/Settlement',
                 data: {match_id:match_id,type:type},
                 success: function(data) {
-                    // alert(data);
                     if(data.status==1){
                         layer.msg(data.msg);
                         location. reload()//刷新当前页面
@@ -481,14 +531,6 @@
             var num = num;
             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();
 
             if(reg.test(num)==false){ 
                 layer.msg('不能为空值');
@@ -499,7 +541,7 @@
                 type: 'POST',
                 dataType: 'json',
                 url: '/admin/Sportsbq/updatascore',
-                data: {only:only,num:num,match_id:match_id,okteamscore:okteamscore,ozteamscore:ozteamscore,tkteamscore:tkteamscore,tzteamscore:tzteamscore,skteamscore:skteamscore,szteamscore:szteamscore,akteamscore:akteamscore,azteamscore:azteamscore},
+                data: {only:only,num:num,match_id:match_id},
                 success: function(data) {
                     if(data.status==1){
                         layer.msg(data.msg);