From 441c4a7f908976368d4d97adf6d1d70fee8fedd5 Mon Sep 17 00:00:00 2001
From: cyc <cyc@hainatravel.com>
Date: Mon, 13 Aug 2018 13:40:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../third_party/train/controllers/search.php  | 27 +++++++++----------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/application/third_party/train/controllers/search.php b/application/third_party/train/controllers/search.php
index addb3cca..46309613 100644
--- a/application/third_party/train/controllers/search.php
+++ b/application/third_party/train/controllers/search.php
@@ -234,9 +234,7 @@ class search extends CI_Controller{
 		}
 		
 		//获取车次信息
-		$obj = $this->BIZ_intel_train_model->get_train_info($trainFromCode->s_code,$trainToCode->s_code);
-		
-		$enobj = array();
+		$obj = $this->BIZ_intel_train_model->get_train_info($trainFromCode,$trainToCode);
 		
 		//如果结果为空则直接返回为空的结果
 		if(empty($obj)){
@@ -244,6 +242,14 @@ class search extends CI_Controller{
 			exit('{"status":"203","reason":"无车次信息！","data":""}');
 		}
 		
+		//处理返回的字符串
+		$return_json = new StdClass();
+		$return_json->status = '200';
+		$return_json->reason = '成功的返回';
+		$return_json->rate = $this->GetCurrencyRate();
+		$return_json->data = array();
+		$return_json->endata = array();
+		
 		//如果有结果则进行字符串处理
 		foreach($obj as $key=>$item){
 			//发车规则处理
@@ -260,7 +266,6 @@ class search extends CI_Controller{
 				}
 			}
 			
-			
 			//价格处理
 			$item->adult_seat = array();
 			$item->child_seat = array();
@@ -292,22 +297,16 @@ class search extends CI_Controller{
 				}
 			}
 			
+			
 			//最后进行当前日期判断，对数据进行分组
 			$flag = $this->checkDateRule($trainDate,$item->DateRule);
 			if(!$flag){
 				//将不符合发车日期的列车放入到另外一个数组中存储起来
-				array_push($enobj,$obj[$key]);
-				unset($obj[$key]);
+				array_push($return_json->endata,$obj[$key]);
+			}else{
+				array_push($return_json->data,$obj[$key]);
 			}
-			
 		}
-		//处理返回的字符串
-		$return_json = new StdClass();
-		$return_json->status = '200';
-		$return_json->reason = '成功的返回';
-		$return_json->rate = $this->GetCurrencyRate();
-		$return_json->data = $obj;
-		$return_json->endata = $enobj;
 		print_r(json_encode($return_json));
 	}