From 2decb4687b6acfb638056e61110f6eb8dab3d466 Mon Sep 17 00:00:00 2001
From: cyc <cyc@hainatravel.com>
Date: Thu, 9 Apr 2020 16:25:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=80=E7=A5=A8=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trainsystem/controllers/callback.php       |  2 ++
 .../trainsystem/controllers/returnorders.php   | 18 +++---------------
 .../trainsystem/models/train_system_model.php  |  8 ++++++--
 3 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/application/third_party/trainsystem/controllers/callback.php b/application/third_party/trainsystem/controllers/callback.php
index 78d9175e..05e8d99b 100644
--- a/application/third_party/trainsystem/controllers/callback.php
+++ b/application/third_party/trainsystem/controllers/callback.php
@@ -262,6 +262,7 @@ class callback extends CI_Controller{
 									$data_passager->ticketprice = $tickets_item->OrderTicketPrice;
 									$data_passager->seatype =  $tickets_item->OrderTicketSeat;
 									$data_passager->seatdetail = $ticket_item2->SeatNo;
+									$data_passager->longtrainno = $ticket_item2->LongTrainNo;
 									$data_passager->TOC_VEI_SN = 28209;
 									$this->train_system_model->add_passagers($data_passager);
 								}
@@ -273,6 +274,7 @@ class callback extends CI_Controller{
 								$data_passager->ticketprice = $tickets_item->OrderTicketPrice;
 								$data_passager->seatype =  $tickets_item->OrderTicketSeat;
 								$data_passager->seatdetail = $tickets_item->DetailInfos->DetailInfo->SeatNo;
+								$data_passager->longtrainno = $tickets_item->DetailInfos->DetailInfo->LongTrainNo;
 								$data_passager->TOC_VEI_SN = 28209;
 								$this->train_system_model->add_passagers($data_passager);
 							}
diff --git a/application/third_party/trainsystem/controllers/returnorders.php b/application/third_party/trainsystem/controllers/returnorders.php
index d470d81d..d5556e24 100644
--- a/application/third_party/trainsystem/controllers/returnorders.php
+++ b/application/third_party/trainsystem/controllers/returnorders.php
@@ -145,23 +145,11 @@ class returnorders extends CI_Controller{
 		$PostData['TrainOrderService']->contactMobile = '18877381547';
 		$PostData['TrainOrderService']->OrderNumber = $ticket_data->ts_ordernumber;
 		$PostData['TrainOrderService']->OperatorType = '0';
-		$PostData['TrainOrderService']->TicketInfo = '';
-		$PostData['TrainOrderService']->TicketInfo = array();
+		$PostData['TrainOrderService']->LongElecNums = array();
+		$PostData['TrainOrderService']->LongElecNums['0'] = $passenger_data->tst_LongTrainNo;
 		
-		$i = 0;
-		$PostData['TrainOrderService']->TicketInfo[$i]['eOrderNumber'] = $passenger_data->ts_elecnumber;
-		if($passenger_data->tst_ticketype == '儿童票'){
-			$PostData['TrainOrderService']->TicketInfo[$i]['eOrderType'] = '2';
-		}else{
-			$PostData['TrainOrderService']->TicketInfo[$i]['eOrderType'] = '1';
-		}
-		$PostData['TrainOrderService']->TicketInfo[$i]['seatNumber'] = $passenger_data->tst_seatdetail;
-		$PostData['TrainOrderService']->TicketInfo[$i]['passportName'] = $passenger_data->tst_realname;
-		$PostData['TrainOrderService']->TicketInfo[$i]['passport'] = $passenger_data->tst_numberid;
-		$PostData['TrainOrderService']->TicketInfo[$i]['realName'] = $passenger_data->tst_realname;
-
 		//发起退票请求
-		$Url = 'http://m.ctrip.com/restapi/soa2/11009/json/PartnerReturnTicket';
+		$Url = 'http://apiproxy.ctrip.com/apiproxy/soa2/13680/PartnerReturnTicket';
 		$ResponseJson = GetPost_http($Url,json_encode($PostData),'json');
 		$ResponseData = json_decode($ResponseJson);
 		
diff --git a/application/third_party/trainsystem/models/train_system_model.php b/application/third_party/trainsystem/models/train_system_model.php
index dbf149dd..1e54a4d7 100644
--- a/application/third_party/trainsystem/models/train_system_model.php
+++ b/application/third_party/trainsystem/models/train_system_model.php
@@ -146,6 +146,7 @@ class train_system_model extends CI_Model {
 					tst_seatstype = '{$data->seatype}',
 					tst_seatdetail = '{$data->seatdetail}',
 					tst_status = '{$data->status}'
+					tst_LongTrainNo = '{$data->longtrainno}'
 				where
 					tst_ordernumber = '{$data->ordernumber}' 
 				and 
@@ -162,7 +163,8 @@ class train_system_model extends CI_Model {
 					tst_ticketype,
 					tst_ticketprice,
 					tst_seatstype,
-					tst_seatdetail
+					tst_seatdetail,
+					tst_LongTrainNo 
 				)VALUES(
 					'{$data->ordernumber}',
 					'{$data->status}',
@@ -172,7 +174,9 @@ class train_system_model extends CI_Model {
 					'{$data->ticketype}',
 					'{$data->ticketprice}',
 					'{$data->seatype}',
-					'{$data->seatdetail}'
+					'{$data->seatdetail}',
+					'{$data->longtrainno}'
+					'{$data->longtrainno}'
 				)
 			";
 		$query =$this->INFO->query($sql);