From 6274f38bef7914ede534cc77da629a36fee0825c Mon Sep 17 00:00:00 2001 From: cyc Date: Wed, 27 Dec 2017 13:28:38 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=89=8B=E5=8A=A8=E5=B1=8F=E8=94=BD?= =?UTF-8?q?=E6=8E=89=E4=B8=8D=E5=BC=80=E8=BD=A6=E6=AC=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/third_party/train/controllers/search.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/application/third_party/train/controllers/search.php b/application/third_party/train/controllers/search.php index f64b25bc..79d7311c 100644 --- a/application/third_party/train/controllers/search.php +++ b/application/third_party/train/controllers/search.php @@ -25,6 +25,12 @@ 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); + + //特殊车次处理(贵阳 -- 重庆) + if(($fromStation == 'GIW') && ($toStation == 'CQW') && (strtotime($train_date) - strtotime('2018-01-16') >= 0)){ + exit('{"httpstatus":200,"reason":"特殊车次不开车","data":""}'); + } + $firstdata = $back_data; $reason = json_decode($back_data)->reason; $return_data = new stdClass(); From c2baa6dfec6390c1caa1532c116bbcb528c544ef Mon Sep 17 00:00:00 2001 From: cyc Date: Wed, 27 Dec 2017 17:02:32 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E7=A9=BA?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E7=9A=84=E5=AD=97=E7=AC=A6=E4=B8=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/third_party/train/controllers/search.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/third_party/train/controllers/search.php b/application/third_party/train/controllers/search.php index 79d7311c..2fa87347 100644 --- a/application/third_party/train/controllers/search.php +++ b/application/third_party/train/controllers/search.php @@ -28,7 +28,7 @@ class search extends CI_Controller{ //特殊车次处理(贵阳 -- 重庆) if(($fromStation == 'GIW') && ($toStation == 'CQW') && (strtotime($train_date) - strtotime('2018-01-16') >= 0)){ - exit('{"httpstatus":200,"reason":"特殊车次不开车","data":""}'); + exit('{"httpstatus":200,"reason":"特殊车次不开车","data":{"result":""}}'); } $firstdata = $back_data;