From bbe79c2e5d86a599de1025d8dd471ccdfa85a753 Mon Sep 17 00:00:00 2001
From: cyc <cyc@hainatravel.com>
Date: Wed, 27 May 2020 10:43:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/third_party/trainsystem/controllers/api.php  | 9 ++++++---
 .../trainsystem/models/train_system_model.php            | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/application/third_party/trainsystem/controllers/api.php b/application/third_party/trainsystem/controllers/api.php
index 5fb5f56c..173295e1 100644
--- a/application/third_party/trainsystem/controllers/api.php
+++ b/application/third_party/trainsystem/controllers/api.php
@@ -100,17 +100,20 @@ class api extends CI_Controller{
 					
 					if(!empty($ticketinfo)){
 						//获取子订单出票状态
+						$doTicketsNum++;
 						$orderInfo->itinerary[$keyColdSn]->status = $ticketinfo->ts_status;
+						$orderInfo->itinerary[$keyColdSn]->elecnumber = $ticketinfo->ts_elecnumber;
+						$orderInfo->itinerary[$keyColdSn]->seatsinfo = $ticketinfo->ts_seatsinfo;
 						
 						//根据子订单状态确定总订单状态池
-						if($ticketinfo->ts_status == 4 or $ticketinfo->ts_status == 7){
+						/*if($ticketinfo->ts_status == 4 or $ticketinfo->ts_status == 7){
 							$orderInfo->itinerary[$keyColdSn]->ordernumber = $ticketinfo->ts_ordernumber;
 							//获取乘客信息
 							$orderInfo->itinerary[$keyColdSn]->passagersTickets = array();
 							$orderInfo->itinerary[$keyColdSn]->passagersTickets = $this->train_system_model->get_passager_details($ticketinfo->ts_ordernumber);
 							
-							$doTicketsNum++;
-						}
+							
+						}*/
 					}
 					
 				}
diff --git a/application/third_party/trainsystem/models/train_system_model.php b/application/third_party/trainsystem/models/train_system_model.php
index faed195c..44eda170 100644
--- a/application/third_party/trainsystem/models/train_system_model.php
+++ b/application/third_party/trainsystem/models/train_system_model.php
@@ -232,7 +232,7 @@ class train_system_model extends CI_Model {
 	
 	//获取订单出票状态
 	public function get_tickets_info($cold_sn){
-		$sql = "select top 1 ts_status,ts_ordernumber from trainsystem where ts_cold_sn = ? order by ts_subtime desc";
+		$sql = "select top 1 ts_status,ts_ordernumber,ts_elecnumber,ts_seatsinfo from trainsystem where ts_cold_sn = ? and ts_status in ('4','7') order by ts_subtime desc";
 		$query = $this->INFO->query($sql,array($cold_sn));
 		return $query->row();
 	}