Merge branch 'master' of github.com:hainatravel/information-system

application/third_party/trainsystem/controllers/innerTrainSearch.php

@@ -479,13 +479,13 @@ class innerTrainSearch extends CI_Controller{
 
 			$ResponseData = json_decode($ResponseJson);
 
-// 			// 获取 microtime
-// $microtime = microtime(true);
+			// 			// 获取 microtime
+			// $microtime = microtime(true);
 
-// // 将时间戳转换为毫秒
-// $timestampInMilliseconds = round($microtime * 1000);
+			// // 将时间戳转换为毫秒
+			// $timestampInMilliseconds = round($microtime * 1000);
 
-// echo $timestampInMilliseconds;
+			// echo $timestampInMilliseconds;
 
 			//  echo($ResponseJson);
 			//  die();
@@ -897,8 +897,8 @@ class innerTrainSearch extends CI_Controller{
 			exit('传参错误！');
 		}
 
-		//$back_json = $this->NewCtripApi($train_date,$fromStation,$toStation,true);
-		$back_json = $this->LanHaiApi($train_date,$fromStation,$toStation,true);
+		$back_json = $this->NewCtripApi($train_date,$fromStation,$toStation,true);
+		//$back_json = $this->LanHaiApi($train_date,$fromStation,$toStation,true);
 		$train_info = new stdClass();
 		$train_info = json_decode($back_json);