追加推送 6/4

app/Http/Controllers/Admin/SportsfootController.php

@@ -50,6 +50,8 @@ class SportsfootController extends Controller {
 		return view('admin.sportsfoot/outcome', $dt->render($request));
 	}
 
+
+
 	//结算
 	function Settlement(Req $req){
 		//查询赛事下所有订单
@@ -159,11 +161,11 @@ class SportsfootController extends Controller {
 		}
 		if (!empty($star_time)) {
             $star_time = date('Y-m-d H:i:s', strtotime($star_time));
-            $where[] = array('st_zq_result.update_time', '>=', $star_time);
+            $where[] = array('st_zq_result.update_time', '>', $star_time);
         }
         if (!empty($end_time)) {
             $end_time = date('Y-m-d H:i:s', strtotime($end_time));
-            $where[] = array('st_zq_result.update_time', '<=', $end_time);
+            $where[] = array('st_zq_result.update_time', '<', $end_time);
         }
         $newapp = new \App\Models\Stzqresult();
         $data = $newapp->resultlist($list, $page, $where, $orwhere);
@@ -172,16 +174,15 @@ class SportsfootController extends Controller {
     }
 
     //
-    function saislist(){
-    	$lgid = $_POST['lgid'];//赛事id
+    function saislist(Req $req){
+    	$lgid = $req->lgid;//赛事id
 		$newstzqcompetition = new \App\Models\Stzqcompetition();
 		$league_data = $newstzqcompetition->allcompetition($lgid);//赛事id
-    	// var_dump($league_data);die;
 
 		return $league_data;
     }
     
-	//赛事结果添加
+	//赛事结果添加  guest_score 客队进球  all_goal总进球数
     function addoutcome(Req $req) {
 		if (!$req->isMethod('post')) {
             $lange = trans('menu');
@@ -190,28 +191,53 @@ class SportsfootController extends Controller {
 
             return view('admin.sportsfoot/addoutcome',['data'=>$league_data]);
         } else {
-            $model = new \App\Models\Stzqresult();
-			$model->lg_id = trim($req->input('lg_id'));//联赛id
-			$model->home_team = trim($req->input('home_team'));
-			$model->guest_team = trim($req->input('guest_team'));
-			$model->home_rate = trim($req->input('home_rate'));
-			$model->guest_rate = trim($req->input('guest_rate'));
-			$model->home_score = trim($req->input('home_score'));
-			$model->status = trim($req->input('status'));
-			$model->first_score = trim($req->input('first_score'));
-			$model->last_score = trim($req->input('last_score'));
-			$model->match_score = trim($req->input('match_score'));
-			$model->match_winer = trim($req->input('match_winer'));
-			$model->update_time = "2019-04-03 09:19:30";//比赛更新时间
-			$model->match_time = '53:53';// trim($req->input('match_time'));
-			$model->match_process = trim($req->input('match_process'));
-			$model->tag = trim($req->input('tag'));
-			$model->match_id = trim($req->input('match_id'));//赛事id
-			$model->u_home_score = trim($req->input('u_home_score'));
-			$model->u_guest_score = trim($req->input('u_guest_score'));
-			// var_dump($req->input());die;
-			$model->save();
-			return responseToJson(1);
+        	$match_id = trim($req->input('match_id'));//赛事id
+        	$data = \App\Models\Stzqresult::where(['match_id'=>$match_id])->first();
+
+        	if(count($data) <= 0 ){
+        		$model = new \App\Models\Stzqresult();
+				$model->lg_id = trim($req->input('lg_id'));//联赛id
+				$model->home_team = trim($req->input('home_team'));
+				$model->guest_team = trim($req->input('guest_team'));
+				$model->home_rate = trim($req->input('home_rate'));
+				$model->guest_rate = trim($req->input('guest_rate'));
+				$model->home_score = trim($req->input('home_score'));
+				$model->status = trim($req->input('status'));
+				$model->first_score = trim($req->input('first_score'));
+				$model->last_score = trim($req->input('last_score'));
+				$model->match_score = trim($req->input('match_score'));
+				$model->match_winer = trim($req->input('match_winer'));
+				$model->update_time = date('Y-m-d H:i:s');//比赛更新时间
+				$model->match_time = '00:01';// trim($req->input('match_time'));
+				$model->match_process = trim($req->input('match_process'));
+				$model->tag = trim($req->input('tag'));
+				$model->match_id = $match_id;//赛事id
+				$model->u_home_score = trim($req->input('u_home_score'));
+				$model->u_guest_score = trim($req->input('u_guest_score'));
+				$model->save();
+				return responseToJson(1);
+			}else{
+				$data->lg_id = trim($req->input('lg_id'));//联赛id
+				$data->home_team = trim($req->input('home_team'));
+				$data->guest_team = trim($req->input('guest_team'));
+				$data->home_rate = trim($req->input('home_rate'));
+				$data->guest_rate = trim($req->input('guest_rate'));
+				$data->home_score = trim($req->input('home_score'));
+				$data->status = trim($req->input('status'));
+				$data->first_score = trim($req->input('first_score'));
+				$data->last_score = trim($req->input('last_score'));
+				$data->match_score = trim($req->input('match_score'));
+				$data->match_winer = trim($req->input('match_winer'));
+				$data->update_time = date('Y-m-d H:i:s');//比赛更新时间
+				$data->match_time = '00:01';// trim($req->input('match_time'));
+				$data->match_process = trim($req->input('match_process'));
+				$data->tag = trim($req->input('tag'));
+				$data->u_home_score = trim($req->input('u_home_score'));
+				$data->u_guest_score = trim($req->input('u_guest_score'));
+				$data->save();
+				return responseToJson(1);
+			}	
+
         }
     }
 

app/Models/Stzqcompetition.php

@@ -34,7 +34,7 @@ class Stzqcompetition extends Model
 	
 	//足球赛事联赛查询
 	function allcompetition($lg_id){
-		$data = $this->where('lg_id',$lg_id)->select('id','home_team')->get();
+		$data = $this->where('lg_id',$lg_id)->select('match_id','home_team')->get();
         if (!$data) {
 			return -5040000102; //无相关信息
 		}

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

@@ -130,6 +130,7 @@
 
         form.on('select(sect)', function(data) {
             lgid = data.value;
+            // alert(lgid);
             $("#match_id").empty()
             $.ajax({
                 type: 'POST',
@@ -140,7 +141,7 @@
                     if (data != undefined && data != null && data != "") {
                         var html = "<option value=''>请选择所属赛事</option>";
                         for (var i = 0; i < data.length; i++) {
-                            html += "<option value=" + data[i]["id"] + ">" + data[i]["home_team"] + "</option>";
+                            html += "<option value=" + data[i]["match_id"] + ">" + data[i]["home_team"] + "</option>";
                         }
                     $("#match_id").append(html);
                             //重新渲染select