From b6e222dd7046926fda3f2a18164b4019fa4b3b58 Mon Sep 17 00:00:00 2001
From: cyc <cyc@hainatravel.com>
Date: Thu, 4 Jul 2019 10:11:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A8=8B=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/third_party/trainsystem/controllers/api.php       | 4 ++--
 .../third_party/trainsystem/controllers/returnorders.php      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/application/third_party/trainsystem/controllers/api.php b/application/third_party/trainsystem/controllers/api.php
index 9d33819d..988fad79 100644
--- a/application/third_party/trainsystem/controllers/api.php
+++ b/application/third_party/trainsystem/controllers/api.php
@@ -88,14 +88,14 @@ class api extends CI_Controller{
 			$flag = $this->Sendmail_model->SendMailToTable($fromName,$fromEmail,$toName,$toEmail,$subject,$body);
 			$this->BIZ_train_model->update_biz_jol(array("ts_ordernumber"=>$jh_order),array("ts_sendmail"=>1,"ts_m_sn"=>$flag));
 		}else if($status == '1'){
-			$subject = "The train ticket(s) will be issued manually, Order No $coli_id";
+			/*$subject = "The train ticket(s) will be issued manually, Order No $coli_id";
 			$body = $this->load->view('email_fault',$data,true);
 			$this->send_mail_to_wl("订单:{$coli_id} 出票失败","翰特订单号:{$coli_id};聚合订单号:{$jh_order}",$coli_id);
 			//测试阶段，将失败邮件发送一份给操作外联。
 			$flag = $this->Sendmail_model->SendMailToTable($fromName,$fromEmail,$fromName,$fromEmail,$subject,$body);
 			//测试阶段，将失败邮件发送一份给操作外联。
 			$this->Sendmail_model->SendMailToTable($fromName,$fromEmail,$toName,$toEmail,$subject,$body);
-			$this->BIZ_train_model->update_biz_jol(array("ts_ordernumber"=>$jh_order),array("ts_sendmail"=>1,"ts_m_sn"=>$flag));
+			$this->BIZ_train_model->update_biz_jol(array("ts_ordernumber"=>$jh_order),array("ts_sendmail"=>1,"ts_m_sn"=>$flag));*/
 		}
 		
     }
diff --git a/application/third_party/trainsystem/controllers/returnorders.php b/application/third_party/trainsystem/controllers/returnorders.php
index 8812b748..86478387 100644
--- a/application/third_party/trainsystem/controllers/returnorders.php
+++ b/application/third_party/trainsystem/controllers/returnorders.php
@@ -162,7 +162,7 @@ class returnorders extends CI_Controller{
 
 		//发起退票请求
 		$Url = 'http://m.ctrip.com/restapi/soa2/11009/json/PartnerReturnTicket';
-		$ResponseJson = GetPost_http($Url,json_encode($PostData),'POST');
+		$ResponseJson = GetPost_http($Url,json_encode($PostData),'json');
 		$ResponseData = json_decode($ResponseJson);
 		
 		if($ResponseData->Status == 'SUCCESS'){