From 936794054c2219c9c884d06bdabf0f30837d8341 Mon Sep 17 00:00:00 2001
From: cyc <cyc@hainatravel.com>
Date: Wed, 6 Dec 2017 13:42:57 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=9A=E5=90=88=E6=8E=A5=E5=8F=A3=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E8=BF=94=E5=9B=9E=E6=B7=BB=E5=8A=A0=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=BB=A5=E5=8F=8A=E6=98=AF=E5=90=A6=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E7=BC=93=E5=AD=98=E6=A0=87=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/third_party/train/controllers/search.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/application/third_party/train/controllers/search.php b/application/third_party/train/controllers/search.php
index 1ba8e04d..95d25d3b 100644
--- a/application/third_party/train/controllers/search.php
+++ b/application/third_party/train/controllers/search.php
@@ -18,20 +18,23 @@ class search extends CI_Controller{
 			//$url = 'http://op.juhe.cn/trainTickets/ticketsAvailable?key='.JUHE_TRAIN_API_KEY.'&train_date='.$train_date.'&from_station='.$fromStation.'&to_station='.$toStation;
 			$url = 'http://139.129.246.118:12309/trainTickets/ticketsAvailable?key='.JUHE_TRAIN_API_KEY.'&train_date='.$train_date.'&from_station='.$fromStation.'&to_station='.$toStation;
 		$back_data = $this->get_http($url);
+		$reason = json_decode($back_data)->reason;
+		$return_data = new stdClass();
+		$cache = 'no';
 		if(empty(json_decode($back_data)->result)){
 			log_message('error','juhetrain:'.$url.' '.$back_data);
 			$obj = $this->BIZ_train_model->get_train_info($fromStation,$toStation);
 			if($obj){
 				$back_data = $obj->tpc_content;
+				$cache = 'yes';
 				log_message('error','Sn:'.$obj->tpc_sn.'|time:'.$obj->tpc_datetime);
-			}
-			
+			}	
 		}else{
 			$this->BIZ_train_model->addOrUpdate($fromStation,$toStation,$back_data);
 		}
-		//print_r(json_decode($back_data));
-		$return_data = new stdClass();
 		$return_data->httpstatus = 200;
+		$return_data->reason = $reason;
+		$return_data->cache = $cache;
 		$return_data->data = new stdClass();
 		$return_data->data->result = array();
 		$return_data->data->map = new stdClass();