异常处理

app/Http/Controllers/Admin/SportsbkController.php

@@ -188,24 +188,31 @@ class SportsbkController extends Controller {
 				$where[] = array('st_lq_result.home_team', 'like', '%' . $home_team . '%');
 				$orwhere[] = array('st_lq_result.guest_team', 'like', '%' . $home_team . '%');
 			} else {
-				$where[] = array('st_lq_result.home_team', '=', $home_team);
-				$orwhere[] = array('st_lq_result.guest_team', '=', $home_team);
+				if(is_numeric($home_team)){
+					$where[] = array('st_lq_result.match_id', '=', $home_team);
+				}else{
+					$where[] = array('st_lq_result.home_team', '=', $home_team);
+					$orwhere[] = array('st_lq_result.guest_team', '=', $home_team);
+				}
 			}
 		}
+		if(!is_numeric($home_team)){
+			if (!empty($star_time)) {
+	            $star_time = date('Y-m-d H:i:s', strtotime($star_time));
+	            $where[] = array('st_lq_result.start_time', '>', $star_time);
+	            $orwhere[] = array('st_lq_result.start_time', '>', $star_time);
+	        }
+	        if (!empty($end_time)) {
+	            $end_time = date('Y-m-d H:i:s', strtotime($end_time));
+	            $where[] = array('st_lq_result.start_time', '<', $end_time);
+	            $orwhere[] = array('st_lq_result.start_time', '<', $end_time);
+	        }
+	    }
 		if ($status != -1) {
 			$where[] = array('st_lq_result.status', '=', $status);
 			$orwhere[] = array('st_lq_result.status', '=', $status);
 		}
-		if (!empty($star_time)) {
-            $star_time = date('Y-m-d H:i:s', strtotime($star_time));
-            $where[] = array('st_lq_result.start_time', '>', $star_time);
-            $orwhere[] = array('st_lq_result.start_time', '>', $star_time);
-        }
-        if (!empty($end_time)) {
-            $end_time = date('Y-m-d H:i:s', strtotime($end_time));
-            $where[] = array('st_lq_result.start_time', '<', $end_time);
-            $orwhere[] = array('st_lq_result.start_time', '<', $end_time);
-        }
+		
 		$newapp = new \App\Models\Stlqresult();
 		$data = $newapp->resultbklist($list, $page, $where, $orwhere);
 		

app/Models/SportsNoteList.php

@@ -202,7 +202,6 @@ class SportsNoteList extends BaseModel {
                 }
                 //处理冠军联赛玩法详情
                 if($data[$i]->match_id == $content[$b]->lg_id && $data[$i]->batch_id == $content[$b]->batch_id &&$data[$i]->is_champion == 1){
-
                     $content[$b]->condition = '';
 
                     if($content[$b]->p_code == 'first_last_ball' || $content[$b]->p_code == 'half_full' || $content[$b]->p_code == 'capot' || $content[$b]->p_code == 'two_sides' || $content[$b]->p_code == 'total_goal'){
@@ -225,21 +224,23 @@ class SportsNoteList extends BaseModel {
                         }
                     }
                     */
+                    /*
                     for($c=0;$c<count($result);$c++){
                         if($content[$b]->odds_code == $result[$c]->odds_code){
                             $data[$i]->str1 = 1;
                             if($content[$b]->result=='未处理'){
-                                $data[$i]->content = $data[$i]->content.$result[$c]->odds_name.'<br>'.$content[$b]->condition.' '.$data[$i]->team.'@'.$content[$b]->odds.' ￥'.$content[$b]->bet_money.'<br>';
+                                $data[$i]->content = $content[$b]->home_team.'<br>'.$data[$i]->content.$result[$c]->odds_name.'<br>'.$content[$b]->condition.' '.$data[$i]->team.'@'.$content[$b]->odds.' ￥'.$content[$b]->bet_money.'<br>';
                             }else{
-                                $data[$i]->content = $data[$i]->content.$result[$c]->odds_name.'<br>'.$content[$b]->condition.' '.$data[$i]->team.'@'.$content[$b]->odds.' ￥'.$content[$b]->bet_money.'<br><span>'.$content[$b]->result.'</span>('.$content[$b]->matchresult.')<br>';
+                                $data[$i]->content = $content[$b]->home_team.'<br>'.$data[$i]->content.$result[$c]->odds_name.'<br>'.$content[$b]->condition.' '.$data[$i]->team.'@'.$content[$b]->odds.' ￥'.$content[$b]->bet_money.'<br><span>'.$content[$b]->result.'</span>('.$content[$b]->matchresult.')<br>';
                             }
                         }
                     }
+                    */
                     if($data[$i]->str1 == 0){
                         if($content[$b]->result=='未处理'){
-                            $data[$i]->content = $data[$i]->content.$content[$b]->odds_code.'<br>'.$content[$b]->condition.' '.$data[$i]->team.'@'.$content[$b]->odds.' ￥'.$content[$b]->bet_money.'<br>';
+                            $data[$i]->content = $content[$b]->home_team.'<br>'.$data[$i]->content.$content[$b]->odds_code.'<br>'.$content[$b]->condition.' '.$data[$i]->team.'@'.$content[$b]->odds.' ￥'.$content[$b]->bet_money.'<br>';
                         }else{
-                            $data[$i]->content = $data[$i]->content.$content[$b]->odds_code.'<br>'.$content[$b]->condition.' '.$data[$i]->team.'@'.$content[$b]->odds.' ￥'.$content[$b]->bet_money.'<br><span>'.$content[$b]->result.'</span>('.$content[$b]->matchresult.')<br>';
+                            $data[$i]->content = $content[$b]->home_team.'<br>'.$data[$i]->content.$content[$b]->odds_code.'<br>'.$content[$b]->condition.' '.$data[$i]->team.'@'.$content[$b]->odds.' ￥'.$content[$b]->bet_money.'<br><span>'.$content[$b]->result.'</span>('.$content[$b]->matchresult.')<br>';
                         }
                     }
                 }
@@ -548,6 +549,7 @@ class SportsNoteList extends BaseModel {
                         }
                     }
                     */
+                    /*
                     for($c=0;$c<count($result);$c++){
                         if($content[$b]->odds_code == $result[$c]->odds_code){
                             $data[$i]->str1 = 1;
@@ -558,11 +560,12 @@ class SportsNoteList extends BaseModel {
                             }
                         }
                     }
+                    */
                     if($data[$i]->str1 == 0){
                         if($content[$b]->result=='未处理'){
-                            $data[$i]->content = $data[$i]->content.$content[$b]->odds_code.'<br>'.$content[$b]->condition.' '.$data[$i]->team.'@'.$content[$b]->odds.' ￥'.$content[$b]->bet_money.'<br>';
+                            $data[$i]->content = $content[$b]->home_team.'<br>'.$data[$i]->content.$content[$b]->odds_code.'<br>'.$content[$b]->condition.' '.$data[$i]->team.'@'.$content[$b]->odds.' ￥'.$content[$b]->bet_money.'<br>';
                         }else{
-                            $data[$i]->content = $data[$i]->content.$content[$b]->odds_code.'<br>'.$content[$b]->condition.' '.$data[$i]->team.'@'.$content[$b]->odds.' ￥'.$content[$b]->bet_money.'<br><span>'.$content[$b]->result.'</span>('.$content[$b]->matchresult.')<br>';
+                            $data[$i]->content = $content[$b]->home_team.'<br>'.$data[$i]->content.$content[$b]->odds_code.'<br>'.$content[$b]->condition.' '.$data[$i]->team.'@'.$content[$b]->odds.' ￥'.$content[$b]->bet_money.'<br><span>'.$content[$b]->result.'</span>('.$content[$b]->matchresult.')<br>';
                         }
                     }
                 }