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)); }