From c1d014915bf780549d448a0d997b74543c3938cb Mon Sep 17 00:00:00 2001
From: cyc <cyc@hainatravel.com>
Date: Fri, 15 May 2020 15:51:10 +0800
Subject: [PATCH 01/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trainsystem/controllers/addorders.php     |  18 ++-
 .../trainsystem/controllers/api.php           |   9 +-
 .../controllers/innerTrainSearch.php          |  31 ++---
 .../trainsystem/controllers/pages.php         |   2 +-
 .../trainsystem/models/BIZ_train_model.php    | 106 ++++++------------
 .../trainsystem/views/homepage.php            |  42 +++----
 6 files changed, 89 insertions(+), 119 deletions(-)

diff --git a/application/third_party/trainsystem/controllers/addorders.php b/application/third_party/trainsystem/controllers/addorders.php
index 4937f1a9..2c6c94e2 100644
--- a/application/third_party/trainsystem/controllers/addorders.php
+++ b/application/third_party/trainsystem/controllers/addorders.php
@@ -22,7 +22,6 @@ class addorders extends CI_Controller{
 	
 	//问题订单处理
 	public function error_orders_submit(){
-		die();
 		$this->isauto = 4;
 		//获取所有问题订单
 		$errorOrdersList = $this->BIZ_train_model->getErrorOrdersList();
@@ -42,7 +41,6 @@ class addorders extends CI_Controller{
 	
 	//自动出票
 	public function auto_pay_ticket(){
-		die();
 		//log_message('error','auto ticket');
 		date_default_timezone_set('Asia/Shanghai');
 		//判断账户余额，如果小于1000自动退出。
@@ -71,7 +69,7 @@ class addorders extends CI_Controller{
 			$auto_flag = 1;
 			
 			$people_arr = $this->BIZ_train_model->biz_people($cold_sn);
-			$train_info = $this->BIZ_train_model->get_biz_foi($cold_sn);
+			$train_info = $this->BIZ_train_model->biz_order_detail($cold_sn);
 			
 			if($item->COLD_SPFS > 1){
 				//寄送票
@@ -103,35 +101,35 @@ class addorders extends CI_Controller{
 			
 			//不是国内支付宝的付款方式的订单需要受到1000元单价限制
 			if($item->GAI_Type != '15015' && $item->COLI_State != '8'){
-				if($train_info[0]->adultcost > 1000){
+				if($train_info->adultcost > 1000){
 					$auto_flag = 0;
 					$back_message .= '-单价大于1000不自动出票'; 
 				}
 			}
 			
 			//如果为国际火车票就不出票
-			if(in_array($train_info[0]->FlightsNo, $nation_train)){
+			if(in_array($train_info->FlightsNo, $nation_train)){
 				$auto_flag = 0;
 				$back_message .= '-国际火车票不自动出票';
 			}
 			
 			//无座的订单不做出票
-			if($train_info[0]->Aircraft == 'WZ'){
+			if($train_info->Aircraft == 'WZ'){
 				$auto_flag = 0;
 				$back_message .= '-无座不自动出票';
 			}
 			
 			//香港火车不自动出票
-			if($train_info[0]->DepartAirport == 'XJA'){
+			if($train_info->DepartAirport == 'XJA'){
 				$auto_flag = 0;
 				$back_message .= '-香港火车不自动出票';
 			}
 			
-			$DepartureDate = strtotime($train_info[0]->DepartureDate);
+			$DepartureDate = strtotime($train_info->DepartureDate);
 			$time = time();
 			$depart_diff = ($DepartureDate - $time) / 86400;
 			
-			if($train_info[0]->ArrivalAirport == 'XJA' && $train_info[0]->adultcost > 500 && $depart_diff > 5){
+			if($train_info->ArrivalAirport == 'XJA' && $train_info->adultcost > 500 && $depart_diff > 5){
 				$auto_flag = 0;
 				$back_message .= '-内地香港火车金额大于500超过五天不自动出票';
 			}
@@ -140,7 +138,7 @@ class addorders extends CI_Controller{
 			//如果刚好是第三十天的订单
 			if(($item->COLI_State == '8' || $item->COLI_State == '63')){
 				$this->isauto = 3;
-				$time_obj = $this->BIZ_train_model->get_saletime($train_info['0']->DepartAirport_cn);
+				$time_obj = $this->BIZ_train_model->get_saletime($train_info->DepartAirport_cn);
 				//print_r($time_obj);
 				if(!empty($time_obj)){
 					$saletime = strtotime($time_obj->TST_saletime);
diff --git a/application/third_party/trainsystem/controllers/api.php b/application/third_party/trainsystem/controllers/api.php
index d121d6a1..eea8021e 100644
--- a/application/third_party/trainsystem/controllers/api.php
+++ b/application/third_party/trainsystem/controllers/api.php
@@ -33,9 +33,9 @@ class api extends CI_Controller{
 						continue;
 					}else{
 						$data = new stdCLass();
-						$htOrderInfo = $this->BIZ_train_model->get_biz_foi($coldSn);
+						$htOrderInfo = $this->BIZ_train_model->biz_order_detail($coldSn);
 						$data->coldSn = $coldSn;
-						$data->htDepartureTime = date('Y-m-d H:i:s',strtotime($htOrderInfo['0']->DepartureTime));
+						$data->htDepartureTime = date('Y-m-d H:i:s',strtotime($htOrderInfo->DepartureTime));
 						if($trainOrderInfo->ts_channel == 'juhe'){
 							$post_data=array(
 								"key"=>"79f03107b921ef31310bd40a1415c1cb",
@@ -94,6 +94,7 @@ class api extends CI_Controller{
 					$orderInfo->itinerary[$keyColdSn]->departureTime = date('H:i',strtotime($train_info->DepartureTime));
 					$orderInfo->itinerary[$keyColdSn]->arrivalTime = date('H:i',strtotime($train_info->ArrivalTime));
 					$orderInfo->itinerary[$keyColdSn]->Cabin = $train_info->Cabin;
+					$orderInfo->itinerary[$keyColdSn]->price = $train_info->adultprice;
 					$ticketinfo = $this->train_system_model->get_tickets_info($itemColdSn->cold_sn);
 					
 					if(!empty($ticketinfo)){
@@ -154,8 +155,8 @@ class api extends CI_Controller{
 			$data['price']->GAI_SQJECurrency == 'RMB';
 		}
 		$data['allpeople'] = $this->BIZ_train_model->biz_people($info->COLD_SN);
-		$data['train_info'] = $this->BIZ_train_model->get_biz_foi($info->COLD_SN);
-		$differtime = (strtotime($data['train_info'][0]->DepartureTime) - time()) / 3600;
+		$data['train_info'] = $this->BIZ_train_model->biz_order_detail($info->COLD_SN);
+		$differtime = (strtotime($data['train_info']->DepartureTime) - time()) / 3600;
 		$obj = $this->BIZ_train_model->get_biz_jol_info($info->COLD_SN,$jh_order);
 		$data['elecnumber'] = $obj->ts_elecnumber;
 		$status = $obj->ts_status;
diff --git a/application/third_party/trainsystem/controllers/innerTrainSearch.php b/application/third_party/trainsystem/controllers/innerTrainSearch.php
index 9729b99e..af1f1cd7 100644
--- a/application/third_party/trainsystem/controllers/innerTrainSearch.php
+++ b/application/third_party/trainsystem/controllers/innerTrainSearch.php
@@ -248,6 +248,7 @@ class innerTrainSearch extends CI_Controller{
 			$api_end_time = microtime(true);
 			
 			$ResponseData = json_decode($ResponseJson);
+			
 			$api_responsive_time = $api_end_time - $api_start_time;
 			
 			if(empty($ResponseData->Trains)){
@@ -357,22 +358,24 @@ class innerTrainSearch extends CI_Controller{
 						}
 						
 						$PriceStr = $SeaType.'"train_no":'.'"'.$TrainInfo->TrainNo.'"';
-						//对返回的数据进行容错处理
-						$gjrwNum = isset($gjrwNum) ? ticket_exchange($Seats->Price,$gjrwNum,$iseven) : '';
-						$rwNum = isset($rwNum) ? ticket_exchange($Seats->Price,$rwNum,$iseven) : '';
-						$rzNum = isset($rzNum) ? ticket_exchange($Seats->Price,$rzNum,$iseven) : '';
-						$tdzNum = isset($tdzNum) ? ticket_exchange($Seats->Price,$tdzNum,$iseven) : '';
-						$wzNum = isset($wzNum) ? ticket_exchange($Seats->Price,$wzNum,$iseven) : '';
-						$ywNum = isset($ywNum) ? ticket_exchange($Seats->Price,$ywNum,$iseven) : '';
-						$yzNum = isset($yzNum) ? ticket_exchange($Seats->Price,$yzNum,$iseven) : '';
-						$edzNum = isset($edzNum) ? ticket_exchange($Seats->Price,$edzNum,$iseven) : '';
-						$ydzNum = isset($ydzNum) ? ticket_exchange($Seats->Price,$ydzNum,$iseven) : '';
-						$swzNum = isset($swzNum) ? ticket_exchange($Seats->Price,$swzNum,$iseven) : '';
-						$dwNum = isset($dwNum) ? ticket_exchange($Seats->Price,$dwNum,$iseven) : '';
-						$ydwNum = isset($ydwNum) ? ticket_exchange($Seats->Price,$ydwNum,$iseven) : '';
-						$erwNum = isset($erwNum) ? ticket_exchange($Seats->Price,$erwNum,$iseven) : '';
+						
 					}
 					
+					//对返回的数据进行容错处理
+					$gjrwNum = isset($gjrwNum) ? ticket_exchange($Seats->Price,$gjrwNum,$iseven) : '';
+					$rwNum = isset($rwNum) ? ticket_exchange($Seats->Price,$rwNum,$iseven) : '';
+					$rzNum = isset($rzNum) ? ticket_exchange($Seats->Price,$rzNum,$iseven) : '';
+					$tdzNum = isset($tdzNum) ? ticket_exchange($Seats->Price,$tdzNum,$iseven) : '';
+					$wzNum = isset($wzNum) ? ticket_exchange($Seats->Price,$wzNum,$iseven) : '';
+					$ywNum = isset($ywNum) ? ticket_exchange($Seats->Price,$ywNum,$iseven) : '';
+					$yzNum = isset($yzNum) ? ticket_exchange($Seats->Price,$yzNum,$iseven) : '';
+					$edzNum = isset($edzNum) ? ticket_exchange($Seats->Price,$edzNum,$iseven) : '';
+					$ydzNum = isset($ydzNum) ? ticket_exchange($Seats->Price,$ydzNum,$iseven) : '';
+					$swzNum = isset($swzNum) ? ticket_exchange($Seats->Price,$swzNum,$iseven) : '';
+					$dwNum = isset($dwNum) ? ticket_exchange($Seats->Price,$dwNum,$iseven) : '';
+					$ydwNum = isset($ydwNum) ? ticket_exchange($Seats->Price,$ydwNum,$iseven) : '';
+					$erwNum = isset($erwNum) ? ticket_exchange($Seats->Price,$erwNum,$iseven) : '';
+					
 					$runMin = $TrainInfo->DurationMinutes % 60;
 					$runHour = ($TrainInfo->DurationMinutes - $runMin) / 60;
 					
diff --git a/application/third_party/trainsystem/controllers/pages.php b/application/third_party/trainsystem/controllers/pages.php
index 5792dc4d..c6cc9850 100644
--- a/application/third_party/trainsystem/controllers/pages.php
+++ b/application/third_party/trainsystem/controllers/pages.php
@@ -34,7 +34,7 @@ class pages extends CI_Controller{
             foreach ($cold_sn as $v) {
                 $list->info[$i] = new StdClass;
                 $list->info[$i]->people = $this->BIZ_train_model->biz_people($v->COLD_SN);
-                $list->info[$i]->train = $this->BIZ_train_model->get_biz_foi($v->COLD_SN);
+                $list->info[$i]->train = $this->BIZ_train_model->biz_order_detail($v->COLD_SN);
                 $list->info[$i]->status = $this->BIZ_train_model->get_biz_jol($v->COLD_SN);
                 $i++;
             }
diff --git a/application/third_party/trainsystem/models/BIZ_train_model.php b/application/third_party/trainsystem/models/BIZ_train_model.php
index 87cea5be..041e4d98 100644
--- a/application/third_party/trainsystem/models/BIZ_train_model.php
+++ b/application/third_party/trainsystem/models/BIZ_train_model.php
@@ -8,48 +8,6 @@ class BIZ_train_model extends CI_Model {
         $this->INFO = $this->load->database('INFO', TRUE);
     }
 	
-	//获取订单信息
-    function biz_order_detail($cold_sn) {
-        $sql = "        
-                    SELECT TOP 1 bfoi.FOI_SN
-						  ,bfoi.DepartureCity
-						  ,bfoi.ArrivalCity
-                          ,bfoi.FOI_COLD_SN
-                          ,bfoi.DepartAirport
-                          ,bfoi.ArrivalAirport
-                          ,bfoi.FlightsNo
-                          ,bfoi.Aircraft
-						  ,bfoi.Cabin
-                          ,bfoi.DepartureDate
-						  ,bfoi.FOI_SelectedSeat 
-                          ,(
-                               SELECT TOP 1 TRS_StationCN
-                               FROM   TrainStation
-                               WHERE  TRS_Code = DepartAirport
-							   and ISNULL(TRS_StationCN,'')<>''
-                           )  AS DepartAirport_cn
-                          ,(
-                               SELECT TOP 1 TRS_StationCN
-                               FROM   TrainStation
-                               WHERE  TRS_Code = ArrivalAirport
-							   and ISNULL(TRS_StationCN,'')<>''
-                           )  AS ArrivalAirport_cn,
-                           FOI_TrainNetOrderNo,
-                           bfoi.adultcost,
-						   bfoi.childcost,
-						   ArrivalTime,
-						   DepartureTime
-                    FROM   BIZ_FlightsOrderInfo bfoi
-                    WHERE  bfoi.FOI_COLD_SN = ?
-                 ";
-        $query = $this->HT->query($sql, $cold_sn);
-        if ($query->num_rows() > 0) {
-            return $query->row();
-        } else {
-            return false;
-        }
-    }
-	
     //传入一组BPE_SN获取乘客信息
     function in_bpesn_people_info($bpe_sn){
         $sql = "
@@ -103,39 +61,49 @@ class BIZ_train_model extends CI_Model {
         return $query->result();
     }
 	
-	 //传入COLD_SN，获取火车车次等信息
-    function get_biz_foi($cold_sn) {
-        $sql = "
-            SELECT FOI_COLD_SN,
-                   FlightsNo,
-                   Cabin,
-				   Aircraft,
-                   DepartureCity,
-				   DepartAirport,
-				   ArrivalAirport,
-                   ArrivalCity,
-                   DepartureDate,
-                   DepartureTime,
-                   ArrivalTime,
-                   adultcost,
-				   FOI_SelectedSeat,
-				   FOI_TrainNetOrderNo,
-				   FOI_SaleDate,
-				   (
+	//获取订单信息
+    function biz_order_detail($cold_sn) {
+        $sql = "        
+                    SELECT TOP 1 bfoi.FOI_SN
+						  ,bfoi.DepartureCity
+						  ,bfoi.ArrivalCity
+                          ,bfoi.FOI_COLD_SN
+                          ,bfoi.DepartAirport
+                          ,bfoi.ArrivalAirport
+                          ,bfoi.FlightsNo
+                          ,bfoi.Aircraft
+						  ,bfoi.Cabin
+                          ,bfoi.DepartureDate
+						  ,bfoi.FOI_SelectedSeat 
+                          ,(
                                SELECT TOP 1 TRS_StationCN
                                FROM   TrainStation
                                WHERE  TRS_Code = DepartAirport
+							   and ISNULL(TRS_StationCN,'')<>''
                            )  AS DepartAirport_cn
                           ,(
                                SELECT TOP 1 TRS_StationCN
                                FROM   TrainStation
                                WHERE  TRS_Code = ArrivalAirport
-                           )  AS ArrivalAirport_cn
-            FROM   BIZ_FlightsOrderInfo
-            WHERE  FOI_COLD_SN = ?
-            ";
+							   and ISNULL(TRS_StationCN,'')<>''
+                           )  AS ArrivalAirport_cn,
+                           FOI_TrainNetOrderNo,
+                           bfoi.adultcost,
+						   bfoi.childcost,
+						   bfoi.adultprice,
+						   bfoi.childprice,
+						   bfoi.ArrivalTime,
+						   bfoi.DepartureTime,
+						   bfoi.FOI_SaleDate
+                    FROM   BIZ_FlightsOrderInfo bfoi
+                    WHERE  bfoi.FOI_COLD_SN = ?
+                 ";
         $query = $this->HT->query($sql, $cold_sn);
-        return $query->result();
+        if ($query->num_rows() > 0) {
+            return $query->row();
+        } else {
+            return false;
+        }
     }
 	
 	//传入COLD_SN，获取BIZ_JuheOrderList是否存在此子订单，用来判断是否提交过给聚合
@@ -490,9 +458,9 @@ class BIZ_train_model extends CI_Model {
 	
 	//根据订单号获取所有子订单号
 	public function getAllColdSn($coliId){
-		$sql = "select cold_sn from BIZ_ConfirmLineInfo left join BIZ_ConfirmLineDetail on coli_sn = cold_coli_sn where coli_id = ? and COLI_servicetype = '2'";
-		 $query = $this->HT->query($sql, array($coliId));
-		 return $query->result();
+		$sql = "select cold_sn,coli_price from BIZ_ConfirmLineInfo left join BIZ_ConfirmLineDetail on coli_sn = cold_coli_sn where coli_id = ? and COLI_servicetype = '2'";
+		$query = $this->HT->query($sql, array($coliId));
+		return $query->result();
 	}
 	
 	//通过COLI_ID获取团名 即 GroupInfo的GRI_No 
diff --git a/application/third_party/trainsystem/views/homepage.php b/application/third_party/trainsystem/views/homepage.php
index 49127619..953517bf 100644
--- a/application/third_party/trainsystem/views/homepage.php
+++ b/application/third_party/trainsystem/views/homepage.php
@@ -114,16 +114,16 @@ function selseat(seat){
         
           <tr>
             <td><?php echo $num++;?></td>
-            <td><?php echo $v->train[0]->FlightsNo;?></td>
-            <td><?php echo $v->train[0]->Cabin;?></td>
-            <td><?php echo $v->train[0]->DepartureCity;?></td>
-            <td><?php echo $v->train[0]->ArrivalCity;?></td>
-            <td><?php echo $v->train[0]->DepartureDate;?></td>
-            <td><?php echo $v->train[0]->DepartureTime;?></td>
-            <td><?php echo $v->train[0]->ArrivalTime;?></td>
-            <td><?php echo $v->train[0]->adultcost;?></td>
+            <td><?php echo $v->train->FlightsNo;?></td>
+            <td><?php echo $v->train->Cabin;?></td>
+            <td><?php echo $v->train->DepartureCity;?></td>
+            <td><?php echo $v->train->ArrivalCity;?></td>
+            <td><?php echo $v->train->DepartureDate;?></td>
+            <td><?php echo $v->train->DepartureTime;?></td>
+            <td><?php echo $v->train->ArrivalTime;?></td>
+            <td><?php echo $v->train->adultcost;?></td>
             <td><?php echo !empty($v->status)?"否":"<span style='color:green;'>是</span>";?></td>
-            <td><input type="checkbox" name="istanding_<?php echo $v->train[0]->FOI_COLD_SN;?>"/></td>
+            <td><input type="checkbox" name="istanding_<?php echo $v->train->FOI_COLD_SN;?>"/></td>
           </tr>
           <tr>
             <td colspan="11">
@@ -154,12 +154,12 @@ function selseat(seat){
 				  <tr style="text-align:;">
                     <td colspan="11"  class="selectticket">
 						<?php 
-						$traintype = substr($v->train[0]->FlightsNo,0,1);
+						$traintype = substr($v->train->FlightsNo,0,1);
 						$arr = array('C','D','G');
 						$sel_count = 0;
 						if(in_array($traintype,$arr)){
 							$selectseat = '';
-							$train_select = $v->train[0]->FOI_SelectedSeat;
+							$train_select = $v->train->FOI_SelectedSeat;
 							$a1=$b1=$c1=$d1=$f1=$a2=$b2=$c2=$d2=$f2=false;
 							if($train_select){
 								$obj = explode(',',$train_select);
@@ -209,7 +209,7 @@ function selseat(seat){
 								}
 							}
 							$html = '';
-							$html .= '<div class="train-summary">'.$v->train[0]->Cabin.' for '.$v->train[0]->FlightsNo.' <span>(<span class="selected_People">'.$sel_count.'</span> of <span class="seat_TotalPeople">'.count($v->people).'</span> Seats)</span></div>';
+							$html .= '<div class="train-summary">'.$v->train->Cabin.' for '.$v->train->FlightsNo.' <span>(<span class="selected_People">'.$sel_count.'</span> of <span class="seat_TotalPeople">'.count($v->people).'</span> Seats)</span></div>';
 							$html .= '<div class="seatPick">';
 							if($a1){
 								$html .= '<a class="seat-a selected_seat-a selected" type="seat-a" href="javascript:void(0);" data="1A" onclick ="selseat(this)";></a>';
@@ -217,7 +217,7 @@ function selseat(seat){
 								$html .= '<a class="seat-a" type="seat-a" href="javascript:void(0);" data="1A" onclick ="selseat(this)";></a>';
 							}
 							
-							if($v->train[0]->Aircraft == 'O' || $v->train[0]->Aircraft == '8'){
+							if($v->train->Aircraft == 'O' || $v->train->Aircraft == '8'){
 								if($b1){
 									$html .= '<a class="seat-b selected_seat-b selected" type="seat-b" href="javascript:void(0);" data="1B" onclick ="selseat(this);"></a>';
 								}else{
@@ -231,7 +231,7 @@ function selseat(seat){
 								$html .= '<a class="seat-c" type="seat-c" href="javascript:void(0);" data="1C" onclick ="selseat(this);"></a>';
 							}
 							
-							if($v->train[0]->Aircraft != '9'){
+							if($v->train->Aircraft != '9'){
 								if($d1){
 									$html .= '<a class="seat-d selected_seat-d selected" type="seat-d" href="javascript:void(0);" data="1D" onclick ="selseat(this);"></a>';
 								}else{
@@ -253,7 +253,7 @@ function selseat(seat){
 								$html .= '<a class="seat-a" type="seat-a" href="javascript:void(0);" data="2A" onclick ="selseat(this)";></a>';
 							}
 							
-							if($v->train[0]->Aircraft == 'O' || $v->train[0]->Aircraft == '8'){
+							if($v->train->Aircraft == 'O' || $v->train->Aircraft == '8'){
 								if($b2){
 									$html .= '<a class="seat-b selected_seat-b selected" type="seat-b" href="javascript:void(0);" data="2B" onclick ="selseat(this);"></a>';
 								}else{
@@ -267,7 +267,7 @@ function selseat(seat){
 								$html .= '<a class="seat-c" type="seat-c" href="javascript:void(0);" data="2C" onclick ="selseat(this);"></a>';
 							}
 							
-							if($v->train[0]->Aircraft != '9'){
+							if($v->train->Aircraft != '9'){
 								if($d2){
 									$html .= '<a class="seat-d selected_seat-d selected" type="seat-d" href="javascript:void(0);" data="2D" onclick ="selseat(this);"></a>';
 								}else{
@@ -283,7 +283,7 @@ function selseat(seat){
 							
 							$html .= '<div class="clear"></div></div>';
 							
-							if($v->train[0]->Aircraft != 'F'){
+							if($v->train->Aircraft != 'F'){
 								echo $html;
 							}
 						}
@@ -292,21 +292,21 @@ function selseat(seat){
                   </tr>
                   <tr style="text-align:;">
                     <td>
-                      <button type="button" class="btn btn-success checked_pay" data-order="<?php echo $v->train[0]->FOI_COLD_SN;?>">聚合订票</button>
+                      <button type="button" class="btn btn-success checked_pay" data-order="<?php echo $v->train->FOI_COLD_SN;?>">聚合订票</button>
                     </td>
                     <td colspan="4"  class="biaoqian"><span class="back_mes" style="color:red;line-height: 30px;"></span>
                     </td>
                   </tr>
 				  <tr style="text-align:;">
                     <td>
-                      <button type="button" class="btn btn-success ctrip_pay" data-order="<?php echo $v->train[0]->FOI_COLD_SN;?>">携程订票</button>
+                      <button type="button" class="btn btn-success ctrip_pay" data-order="<?php echo $v->train->FOI_COLD_SN;?>">携程订票</button>
                     </td>
                     <td colspan="4"  class="biaoqian"><span class="ctrip_back_mes" style="color:red;line-height: 30px;"></span>
                     </td>
                   </tr>
 				  <tr style="text-align:;">
 					<td>
-                      <button type="button" class="btn btn-success grab_ticket" data-order="<?php echo $v->train[0]->FOI_COLD_SN;?>">抢票</button>
+                      <button type="button" class="btn btn-success grab_ticket" data-order="<?php echo $v->train->FOI_COLD_SN;?>">抢票</button>
                     </td>
                     <td colspan="4">
 					<span class="grab_config"><a style="text-decoration:none;cursor:pointer;">点击打开配置清单</a></span>
@@ -323,7 +323,7 @@ function selseat(seat){
                     </td>
 					
 				  </tr>
-                  <tr id="back_<?php echo $v->train[0]->FOI_COLD_SN;?>" style="display:none;">
+                  <tr id="back_<?php echo $v->train->FOI_COLD_SN;?>" style="display:none;">
                     <td colspan="5">
                       快捷订票处理结果：<span style="color:red;"></span>
                     </td>

From aa6ed146f38b36fd0ed2562df2fcd579db0ce1f4 Mon Sep 17 00:00:00 2001
From: cyc <cyc@hainatravel.com>
Date: Fri, 15 May 2020 16:16:50 +0800
Subject: [PATCH 02/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=B7=E6=A0=BC?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/third_party/trainsystem/controllers/api.php   | 5 ++---
 .../third_party/trainsystem/models/BIZ_train_model.php    | 8 ++++----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/application/third_party/trainsystem/controllers/api.php b/application/third_party/trainsystem/controllers/api.php
index eea8021e..94e085c1 100644
--- a/application/third_party/trainsystem/controllers/api.php
+++ b/application/third_party/trainsystem/controllers/api.php
@@ -77,9 +77,9 @@ class api extends CI_Controller{
 				$orderInfo = new stdCLass();
 				$doTicketsNum = 0;
 				$orderInfo->coliId = $itemId;
-				$flag = $this->BIZ_train_model->get_paypal($itemId);
+				$priceInfo = $this->BIZ_train_model->get_paypal($itemId);
+				$orderInfo->totalPrice = $priceInfo->COLI_Price;
 				
-				$orderInfo->ispay = $flag;
 				$orderInfo->itinerary = array();
 				$coldSnArr = $this->BIZ_train_model->getAllColdSn($itemId);
 				$itineraryNums = count($coldSnArr);
@@ -94,7 +94,6 @@ class api extends CI_Controller{
 					$orderInfo->itinerary[$keyColdSn]->departureTime = date('H:i',strtotime($train_info->DepartureTime));
 					$orderInfo->itinerary[$keyColdSn]->arrivalTime = date('H:i',strtotime($train_info->ArrivalTime));
 					$orderInfo->itinerary[$keyColdSn]->Cabin = $train_info->Cabin;
-					$orderInfo->itinerary[$keyColdSn]->price = $train_info->adultprice;
 					$ticketinfo = $this->train_system_model->get_tickets_info($itemColdSn->cold_sn);
 					
 					if(!empty($ticketinfo)){
diff --git a/application/third_party/trainsystem/models/BIZ_train_model.php b/application/third_party/trainsystem/models/BIZ_train_model.php
index 041e4d98..be7d4f72 100644
--- a/application/third_party/trainsystem/models/BIZ_train_model.php
+++ b/application/third_party/trainsystem/models/BIZ_train_model.php
@@ -337,10 +337,10 @@ class BIZ_train_model extends CI_Model {
 	
 	//获取paypal付款记录
 	function get_paypal($coli_id){
-		$sql = "select top 1 GAI_SQJE,GAI_SQJECurrency from BIZ_GroupAccountInfo where GAI_COLI_ID = ?";
-		$query = $query = $this->HT->query($sql, $coli_id);	
+		$sql = " select GAI_SQJE,GAI_SQJECurrency,COLI_Price from BIZ_ConfirmLineInfo left join BIZ_GroupAccountInfo on COLI_ID = GAI_COLI_ID where COLI_ID = ?";
+		$query = $query = $this->HT->query($sql, $coli_id);
 		if ($query->num_rows() > 0) {
-			return true;
+			return $query->row();
 		} else {
 			return false;
 		}		
@@ -458,7 +458,7 @@ class BIZ_train_model extends CI_Model {
 	
 	//根据订单号获取所有子订单号
 	public function getAllColdSn($coliId){
-		$sql = "select cold_sn,coli_price from BIZ_ConfirmLineInfo left join BIZ_ConfirmLineDetail on coli_sn = cold_coli_sn where coli_id = ? and COLI_servicetype = '2'";
+		$sql = "select cold_sn from BIZ_ConfirmLineInfo left join BIZ_ConfirmLineDetail on coli_sn = cold_coli_sn where coli_id = ? and COLI_servicetype = '2'";
 		$query = $this->HT->query($sql, array($coliId));
 		return $query->result();
 	}

From 7e57e2bd8fa5be7c281747e56d45a7d6ba80770c Mon Sep 17 00:00:00 2001
From: cyc <cyc@hainatravel.com>
Date: Fri, 15 May 2020 16:19:15 +0800
Subject: [PATCH 03/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/third_party/trainsystem/controllers/api.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/third_party/trainsystem/controllers/api.php b/application/third_party/trainsystem/controllers/api.php
index 94e085c1..b938f46c 100644
--- a/application/third_party/trainsystem/controllers/api.php
+++ b/application/third_party/trainsystem/controllers/api.php
@@ -108,7 +108,7 @@ class api extends CI_Controller{
 					
 				}
 				
-				if(!$flag){
+				if(!$priceInfo){
 					$orderInfo->topstatus = 'pending';
 					array_push($returnData->pending,$orderInfo);
 				}elseif($doTicketsNum == $itineraryNums){

From 83060b47020670d22931bb8b2840abc866852ae1 Mon Sep 17 00:00:00 2001
From: cyc <cyc@hainatravel.com>
Date: Fri, 15 May 2020 16:32:32 +0800
Subject: [PATCH 04/17] =?UTF-8?q?=E4=BB=B7=E6=A0=BC=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/third_party/trainsystem/controllers/api.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/third_party/trainsystem/controllers/api.php b/application/third_party/trainsystem/controllers/api.php
index b938f46c..04f5eb20 100644
--- a/application/third_party/trainsystem/controllers/api.php
+++ b/application/third_party/trainsystem/controllers/api.php
@@ -78,7 +78,7 @@ class api extends CI_Controller{
 				$doTicketsNum = 0;
 				$orderInfo->coliId = $itemId;
 				$priceInfo = $this->BIZ_train_model->get_paypal($itemId);
-				$orderInfo->totalPrice = $priceInfo->COLI_Price;
+				$orderInfo->totalPrice = (int) $priceInfo->COLI_Price;
 				
 				$orderInfo->itinerary = array();
 				$coldSnArr = $this->BIZ_train_model->getAllColdSn($itemId);
@@ -108,7 +108,7 @@ class api extends CI_Controller{
 					
 				}
 				
-				if(!$priceInfo){
+				if(empty($priceInfo->GAI_SQJE)){
 					$orderInfo->topstatus = 'pending';
 					array_push($returnData->pending,$orderInfo);
 				}elseif($doTicketsNum == $itineraryNums){

From 51cd793f6c5c92047e2c7f944e320b45fe21bae0 Mon Sep 17 00:00:00 2001
From: cyc <cyc@hainatravel.com>
Date: Tue, 19 May 2020 11:18:11 +0800
Subject: [PATCH 05/17] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AF=BB=E5=8F=96?=
 =?UTF-8?q?=E4=B9=98=E5=AE=A2=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../third_party/trainsystem/controllers/api.php       | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/application/third_party/trainsystem/controllers/api.php b/application/third_party/trainsystem/controllers/api.php
index 04f5eb20..ef1467b9 100644
--- a/application/third_party/trainsystem/controllers/api.php
+++ b/application/third_party/trainsystem/controllers/api.php
@@ -58,14 +58,14 @@ class api extends CI_Controller{
 	
 	//获取订单出票状态  
 	public function isbooktickets(){
-		$orderIdListStr = $this->input->get('orderIdListStr');
+		/*$orderIdListStr = $this->input->get('orderIdListStr');
 		if($orderIdListStr == ''){
 			exit('数据为空！');
 		}
 		
-		$orderData = explode(',',$orderIdListStr);
+		$orderData = explode(',',$orderIdListStr);*/
 		
-		//$orderData = ['2005075526','2004125562','2005055512','2003305598'];
+		$orderData = ['2005075526','2004125562','2005055512','2003305598'];
 		
 		$returnData = new stdCLass();
 		$returnData->pending = array();
@@ -102,6 +102,11 @@ class api extends CI_Controller{
 						
 						//根据子订单状态确定总订单状态池
 						if($ticketinfo->ts_status == 4 or $ticketinfo->ts_status == 7){
+							$orderInfo->itinerary[$keyColdSn]->ordernumber = $ticketinfo->ts_ordernumber;
+							//获取乘客信息
+							$orderInfo->itinerary[$keyColdSn]->passagersinfos = array();
+							$orderInfo->itinerary[$keyColdSn]->passagersinfos = $this->train_system_model->get_passager_details($ticketinfo->ts_ordernumber);
+							
 							$doTicketsNum++;
 						}
 					}

From b73d0e214ced506edc2492049b3122cb9923c116 Mon Sep 17 00:00:00 2001
From: cyc <cyc@hainatravel.com>
Date: Tue, 19 May 2020 11:25:03 +0800
Subject: [PATCH 06/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/third_party/trainsystem/controllers/api.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/application/third_party/trainsystem/controllers/api.php b/application/third_party/trainsystem/controllers/api.php
index ef1467b9..89b33ea1 100644
--- a/application/third_party/trainsystem/controllers/api.php
+++ b/application/third_party/trainsystem/controllers/api.php
@@ -58,14 +58,14 @@ class api extends CI_Controller{
 	
 	//获取订单出票状态  
 	public function isbooktickets(){
-		/*$orderIdListStr = $this->input->get('orderIdListStr');
+		$orderIdListStr = $this->input->get('orderIdListStr');
 		if($orderIdListStr == ''){
 			exit('数据为空！');
 		}
 		
-		$orderData = explode(',',$orderIdListStr);*/
+		$orderData = explode(',',$orderIdListStr);
 		
-		$orderData = ['2005075526','2004125562','2005055512','2003305598'];
+		//$orderData = ['2005075526','2004125562','2005055512','2003305598'];
 		
 		$returnData = new stdCLass();
 		$returnData->pending = array();

From 573b4ccd8a700b96a376a6c6e6589e1ee5ac50e5 Mon Sep 17 00:00:00 2001
From: cyc <cyc@hainatravel.com>
Date: Thu, 21 May 2020 16:34:45 +0800
Subject: [PATCH 07/17] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B9=98=E5=AE=A2?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=EF=BC=8C=E4=BF=AE=E6=94=B9=E7=A5=A8=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/third_party/trainsystem/controllers/api.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/application/third_party/trainsystem/controllers/api.php b/application/third_party/trainsystem/controllers/api.php
index 89b33ea1..e80900db 100644
--- a/application/third_party/trainsystem/controllers/api.php
+++ b/application/third_party/trainsystem/controllers/api.php
@@ -94,6 +94,8 @@ class api extends CI_Controller{
 					$orderInfo->itinerary[$keyColdSn]->departureTime = date('H:i',strtotime($train_info->DepartureTime));
 					$orderInfo->itinerary[$keyColdSn]->arrivalTime = date('H:i',strtotime($train_info->ArrivalTime));
 					$orderInfo->itinerary[$keyColdSn]->Cabin = $train_info->Cabin;
+					$orderInfo->itinerary[$keyColdSn]->FlightsNo = $train_info->FlightsNo;
+					$orderInfo->itinerary[$keyColdSn]->passagerInfos = $this->BIZ_train_model->biz_people($itemColdSn->cold_sn);
 					$ticketinfo = $this->train_system_model->get_tickets_info($itemColdSn->cold_sn);
 					
 					if(!empty($ticketinfo)){
@@ -104,8 +106,8 @@ class api extends CI_Controller{
 						if($ticketinfo->ts_status == 4 or $ticketinfo->ts_status == 7){
 							$orderInfo->itinerary[$keyColdSn]->ordernumber = $ticketinfo->ts_ordernumber;
 							//获取乘客信息
-							$orderInfo->itinerary[$keyColdSn]->passagersinfos = array();
-							$orderInfo->itinerary[$keyColdSn]->passagersinfos = $this->train_system_model->get_passager_details($ticketinfo->ts_ordernumber);
+							$orderInfo->itinerary[$keyColdSn]->passagersTickets = array();
+							$orderInfo->itinerary[$keyColdSn]->passagersTickets = $this->train_system_model->get_passager_details($ticketinfo->ts_ordernumber);
 							
 							$doTicketsNum++;
 						}

From 2d6955abd2452494c59e1e3020b9cbe3a5aee573 Mon Sep 17 00:00:00 2001
From: cyc <cyc@hainatravel.com>
Date: Fri, 22 May 2020 09:33:02 +0800
Subject: [PATCH 08/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9amp=E9=AA=8C=E8=AF=81?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=99=A8=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/libraries/Amplib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/libraries/Amplib.php b/application/libraries/Amplib.php
index 6ed1ccb3..e76bd514 100644
--- a/application/libraries/Amplib.php
+++ b/application/libraries/Amplib.php
@@ -117,7 +117,7 @@ class Amplib {
         //AMP格式验证
         if ($amp_status !== '0') {//只有发布的时候才需要验证
             //把AMP网页内容到purifycss处理，内置了AMP-Validator
-            $purifycss_server = 'http://184.172.113.217:33033/';
+            $purifycss_server = 'http://169.54.167.189:33033/';
             if ($this->CI->config->item('site_code' == 'gm')) {//德语站点使用自己的css处理服务器
                 $purifycss_server = 'http://158.177.67.52:33033/';
             }

From 5b6ffbc24d97ba237022dfa03a57fc8bedf02084 Mon Sep 17 00:00:00 2001
From: cyc <cyc@hainatravel.com>
Date: Tue, 26 May 2020 13:54:58 +0800
Subject: [PATCH 09/17] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E9=82=AE=E4=BB=B6=E5=8F=91=E9=80=81=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trainsystem/controllers/api.php           | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/application/third_party/trainsystem/controllers/api.php b/application/third_party/trainsystem/controllers/api.php
index e80900db..5fb5f56c 100644
--- a/application/third_party/trainsystem/controllers/api.php
+++ b/application/third_party/trainsystem/controllers/api.php
@@ -225,6 +225,41 @@ class api extends CI_Controller{
 		}
     }
 	
+	public function send_options_mail_to_wl(){
+		header('Access-Control-Allow-Origin:*'); 
+		header('Access-Control-Allow-Methods:POST, GET');
+		header('Access-Control-Max-Age:0');
+		header('Access-Control-Allow-Headers:x-requested-with, Content-Type');
+		header('Access-Control-Allow-Credentials:true');
+		$fromName  = "cyc";
+		$fromEmail = "cyc@hainatravel.com";
+		
+		$order = $this->input->get_post('order');
+		$person = $this->input->get_post('person');
+		$type = $this->input->get_post('type');
+		$request = $this->input->get_post('request');
+		$body = '';
+		
+		$coli_id = $this->BIZ_train_model->cold_sn_get_coli_id($order);
+		$trainInfos = $this->BIZ_train_model->biz_order_detail($order);
+		$passager = $this->BIZ_train_model->in_bpesn_people_info($person);
+
+		$body .= '订单号：'.$coli_id['0']->COLI_ID.'<br>';
+		$body .= '车程：'.$trainInfos->DepartAirport_cn.'->'.$trainInfos->ArrivalAirport_cn.','.$trainInfos->FlightsNo.','.date('Y-m-d',strtotime($trainInfos->DepartureDate)).'<br>';
+		$body .= '乘客：'.$passager['0']->BPE_FirstName.$passager['0']->BPE_MiddleName.$passager['0']->BPE_LastName.','.$passager['0']->BPE_Passport.'<br>';
+		$body .= '操作：'.$type.'<br>';
+		$body .= '详细信息：'.$request.'<br>';
+		
+		$toName = 'Sharon';
+		$toEmail = 'Sharon@hainatravel.com';
+		$subject = '用户中心操作';
+		
+		$obj = $this->Sendmail_model->SendMailToTable($fromName,$fromEmail,$toName,$toEmail,$subject,$body);
+		if($obj){
+			exit('{"status":"200","reason":"邮件发送成功"}');
+		}
+	}
+	
 	//导出账单api
 	public function export_excel(){
 		set_time_limit(0);

From ed15c4b5c53c7e93e117ef48c85976fcea80dae0 Mon Sep 17 00:00:00 2001
From: cyc <cyc@hainatravel.com>
Date: Wed, 27 May 2020 09:32:35 +0800
Subject: [PATCH 10/17] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=8B=E6=9C=BA?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/third_party/trainsystem/controllers/addorders.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/third_party/trainsystem/controllers/addorders.php b/application/third_party/trainsystem/controllers/addorders.php
index 2c6c94e2..a0551232 100644
--- a/application/third_party/trainsystem/controllers/addorders.php
+++ b/application/third_party/trainsystem/controllers/addorders.php
@@ -318,9 +318,9 @@ class addorders extends CI_Controller{
 			}
 			
 			if($passporttypeseid == 'G'){
-				$passengers .= ',{"passengerid":' . (++$key) . ',"passengersename":"' . $passengersename . '","piaotype":"' . $piaotype . '","piaotypename":"' . $piaotypename . '","passporttypeseid":"' . $passporttypeseid . '","passporttypeseidname":"' . $passporttypeseidname . '","passportseno":"' . $passportseno . '","price":"'.$data["train"]->adultcost.'","zwcode":"' . $zwcode . '","zwname":"' . $zwname . '","gatValidDateEnd":"'.$item->BPE_PassExpdate.'","gatBornDate":"'.$item->BPE_BirthDate.'","sexCode":"'.$sex.'","email":"'.$data['email'].'"}';
+				$passengers .= ',{"passengerid":' . (++$key) . ',"passengersename":"' . $passengersename . '","piaotype":"' . $piaotype . '","piaotypename":"' . $piaotypename . '","passporttypeseid":"' . $passporttypeseid . '","passporttypeseidname":"' . $passporttypeseidname . '","passportseno":"' . $passportseno . '","price":"'.$data["train"]->adultcost.'","zwcode":"' . $zwcode . '","zwname":"' . $zwname . '","gatValidDateEnd":"'.$item->BPE_PassExpdate.'","gatBornDate":"'.$item->BPE_BirthDate.'","sexCode":"'.$sex.'","email":"'.$data['email'].'","phoneNum":"13097735982"}';
 			}elseif($passporttypeseid == 'B'){
-				$passengers .= ',{"passengerid":' . ( ++$key) . ',"passengersename":"' . $passengersename . '","piaotype":"' . $piaotype . '","piaotypename":"' . $piaotypename . '","passporttypeseid":"' . $passporttypeseid . '","passporttypeseidname":"' . $passporttypeseidname . '","passportseno":"' . $passportseno . '","price":"'.$data["train"]->adultcost.'","zwcode":"' . $zwcode . '","zwname":"' . $zwname . '","countryCode":"US","email":"'.$data['email'].'"}';
+				$passengers .= ',{"passengerid":' . ( ++$key) . ',"passengersename":"' . $passengersename . '","piaotype":"' . $piaotype . '","piaotypename":"' . $piaotypename . '","passporttypeseid":"' . $passporttypeseid . '","passporttypeseidname":"' . $passporttypeseidname . '","passportseno":"' . $passportseno . '","price":"'.$data["train"]->adultcost.'","zwcode":"' . $zwcode . '","zwname":"' . $zwname . '","countryCode":"US","email":"'.$data['email'].'","phoneNum":"13097735982"}';
 			}else{
 				$passengers .= ',{"passengerid":' . ( ++$key) . ',"passengersename":"' . $passengersename . '","piaotype":"' . $piaotype . '","piaotypename":"' . $piaotypename . '","passporttypeseid":"' . $passporttypeseid . '","passporttypeseidname":"' . $passporttypeseidname . '","passportseno":"' . $passportseno . '","price":"'.$data["train"]->adultcost.'","zwcode":"' . $zwcode . '","zwname":"' . $zwname . '","phoneNum":"13097735982","email":"'.$data['email'].'"}';
 			}

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 11/17] =?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();
 	}

From 0f315aa5ee96cbf09b4ecd8ab3b8fcb2a8e74efa Mon Sep 17 00:00:00 2001
From: cyc <cyc@hainatravel.com>
Date: Wed, 27 May 2020 11:21:18 +0800
Subject: [PATCH 12/17] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E9=93=BE=E6=8E=A5=E5=85=B3=E9=97=AD=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/third_party/trainsystem/controllers/api.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/application/third_party/trainsystem/controllers/api.php b/application/third_party/trainsystem/controllers/api.php
index 173295e1..bfb4bd4a 100644
--- a/application/third_party/trainsystem/controllers/api.php
+++ b/application/third_party/trainsystem/controllers/api.php
@@ -86,6 +86,14 @@ class api extends CI_Controller{
 				
 				foreach ($coldSnArr as $keyColdSn=>$itemColdSn){
 					$train_info = $this->BIZ_train_model->biz_order_detail($itemColdSn->cold_sn);
+					
+					//距离发车时间小于24小时的，直接屏蔽订单。关闭支付
+					$todayTime = date();
+					$thisTrainDeparTime = strtotime($train_info->DepartureDate);
+					if($todayTime - $thisTrainDeparTime < 86400){
+						continue;
+					}
+					
 					$orderInfo->itinerary[$keyColdSn] = new stdClass();
 					$orderInfo->itinerary[$keyColdSn]->coldSn = $train_info->FOI_COLD_SN;
 					$orderInfo->itinerary[$keyColdSn]->departureCity = $train_info->DepartureCity;

From 2a5a8e7cdcb60de3f8ab160ef0cbbbc0d81f667a Mon Sep 17 00:00:00 2001
From: cyc <cyc@hainatravel.com>
Date: Wed, 27 May 2020 11:22:59 +0800
Subject: [PATCH 13/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=87=BD=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/third_party/trainsystem/controllers/api.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/third_party/trainsystem/controllers/api.php b/application/third_party/trainsystem/controllers/api.php
index bfb4bd4a..566c7006 100644
--- a/application/third_party/trainsystem/controllers/api.php
+++ b/application/third_party/trainsystem/controllers/api.php
@@ -88,7 +88,7 @@ class api extends CI_Controller{
 					$train_info = $this->BIZ_train_model->biz_order_detail($itemColdSn->cold_sn);
 					
 					//距离发车时间小于24小时的，直接屏蔽订单。关闭支付
-					$todayTime = date();
+					$todayTime = time();
 					$thisTrainDeparTime = strtotime($train_info->DepartureDate);
 					if($todayTime - $thisTrainDeparTime < 86400){
 						continue;

From cbbcdc52371810afebd2076bb14fbdb82bcd0776 Mon Sep 17 00:00:00 2001
From: cyc <cyc@hainatravel.com>
Date: Wed, 27 May 2020 15:33:10 +0800
Subject: [PATCH 14/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E8=AE=A1=E7=AE=97=E8=BF=87=E6=9C=9F=E8=BD=A6=E7=A5=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trainsystem/controllers/api.php           | 102 ++++++++++--------
 .../trainsystem/models/BIZ_train_model.php    |   2 +-
 2 files changed, 56 insertions(+), 48 deletions(-)

diff --git a/application/third_party/trainsystem/controllers/api.php b/application/third_party/trainsystem/controllers/api.php
index 566c7006..6d75d804 100644
--- a/application/third_party/trainsystem/controllers/api.php
+++ b/application/third_party/trainsystem/controllers/api.php
@@ -81,60 +81,68 @@ class api extends CI_Controller{
 				$orderInfo->totalPrice = (int) $priceInfo->COLI_Price;
 				
 				$orderInfo->itinerary = array();
+				
 				$coldSnArr = $this->BIZ_train_model->getAllColdSn($itemId);
 				$itineraryNums = count($coldSnArr);
 				
-				foreach ($coldSnArr as $keyColdSn=>$itemColdSn){
-					$train_info = $this->BIZ_train_model->biz_order_detail($itemColdSn->cold_sn);
-					
-					//距离发车时间小于24小时的，直接屏蔽订单。关闭支付
-					$todayTime = time();
-					$thisTrainDeparTime = strtotime($train_info->DepartureDate);
-					if($todayTime - $thisTrainDeparTime < 86400){
-						continue;
+				if(empty($priceInfo->GAI_SQJE)){
+					$orderInfo->topstatus = 'pending';
+					foreach ($coldSnArr as $keyColdSn=>$itemColdSn){
+						$train_info = $this->BIZ_train_model->biz_order_detail($itemColdSn->cold_sn);
+						
+						//todo 计算是否有逾期车程，扣除逾期车程，计算价格变动
+						$today = time();
+						
+						if(strtotime($itemColdSn->COLI_ApplyDate) - $today < 86400){
+							$orderInfo->totalPrice = $orderInfo->totalPrice - 0;
+							continue;
+						}
+						
+						$orderInfo->itinerary[$keyColdSn] = new stdClass();
+						$orderInfo->itinerary[$keyColdSn]->coldSn = $train_info->FOI_COLD_SN;
+						$orderInfo->itinerary[$keyColdSn]->departureCity = $train_info->DepartureCity;
+						$orderInfo->itinerary[$keyColdSn]->arrivalCity = $train_info->ArrivalCity;
+						$orderInfo->itinerary[$keyColdSn]->departureDate = date('Y-m-d',strtotime($train_info->DepartureDate));
+						$orderInfo->itinerary[$keyColdSn]->departureTime = date('H:i',strtotime($train_info->DepartureTime));
+						$orderInfo->itinerary[$keyColdSn]->arrivalTime = date('H:i',strtotime($train_info->ArrivalTime));
+						$orderInfo->itinerary[$keyColdSn]->Cabin = $train_info->Cabin;
+						$orderInfo->itinerary[$keyColdSn]->FlightsNo = $train_info->FlightsNo;
+						$orderInfo->itinerary[$keyColdSn]->passagerInfos = $this->BIZ_train_model->biz_people($itemColdSn->cold_sn);
+						array_push($returnData->pending,$orderInfo);
 					}
 					
-					$orderInfo->itinerary[$keyColdSn] = new stdClass();
-					$orderInfo->itinerary[$keyColdSn]->coldSn = $train_info->FOI_COLD_SN;
-					$orderInfo->itinerary[$keyColdSn]->departureCity = $train_info->DepartureCity;
-					$orderInfo->itinerary[$keyColdSn]->arrivalCity = $train_info->ArrivalCity;
-					$orderInfo->itinerary[$keyColdSn]->departureDate = date('Y-m-d',strtotime($train_info->DepartureDate));
-					$orderInfo->itinerary[$keyColdSn]->departureTime = date('H:i',strtotime($train_info->DepartureTime));
-					$orderInfo->itinerary[$keyColdSn]->arrivalTime = date('H:i',strtotime($train_info->ArrivalTime));
-					$orderInfo->itinerary[$keyColdSn]->Cabin = $train_info->Cabin;
-					$orderInfo->itinerary[$keyColdSn]->FlightsNo = $train_info->FlightsNo;
-					$orderInfo->itinerary[$keyColdSn]->passagerInfos = $this->BIZ_train_model->biz_people($itemColdSn->cold_sn);
-					$ticketinfo = $this->train_system_model->get_tickets_info($itemColdSn->cold_sn);
-					
-					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;
+				}else{
+					foreach ($coldSnArr as $keyColdSn=>$itemColdSn){
+						$train_info = $this->BIZ_train_model->biz_order_detail($itemColdSn->cold_sn);
+						
+						$orderInfo->itinerary[$keyColdSn] = new stdClass();
+						$orderInfo->itinerary[$keyColdSn]->coldSn = $train_info->FOI_COLD_SN;
+						$orderInfo->itinerary[$keyColdSn]->departureCity = $train_info->DepartureCity;
+						$orderInfo->itinerary[$keyColdSn]->arrivalCity = $train_info->ArrivalCity;
+						$orderInfo->itinerary[$keyColdSn]->departureDate = date('Y-m-d',strtotime($train_info->DepartureDate));
+						$orderInfo->itinerary[$keyColdSn]->departureTime = date('H:i',strtotime($train_info->DepartureTime));
+						$orderInfo->itinerary[$keyColdSn]->arrivalTime = date('H:i',strtotime($train_info->ArrivalTime));
+						$orderInfo->itinerary[$keyColdSn]->Cabin = $train_info->Cabin;
+						$orderInfo->itinerary[$keyColdSn]->FlightsNo = $train_info->FlightsNo;
+						$orderInfo->itinerary[$keyColdSn]->passagerInfos = $this->BIZ_train_model->biz_people($itemColdSn->cold_sn);
+						$ticketinfo = $this->train_system_model->get_tickets_info($itemColdSn->cold_sn);
 						
-						//根据子订单状态确定总订单状态池
-						/*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);
-							
-							
-						}*/
+						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($doTicketsNum == $itineraryNums){
+						$orderInfo->topstatus = 'confirmed';
+						array_push($returnData->confirmed,$orderInfo);
+					}elseif($doTicketsNum < $itineraryNums){
+						$orderInfo->topstatus = 'processing';
+						array_push($returnData->processing,$orderInfo);
 					}
-					
-				}
-				
-				if(empty($priceInfo->GAI_SQJE)){
-					$orderInfo->topstatus = 'pending';
-					array_push($returnData->pending,$orderInfo);
-				}elseif($doTicketsNum == $itineraryNums){
-					$orderInfo->topstatus = 'confirmed';
-					array_push($returnData->confirmed,$orderInfo);
-				}elseif($doTicketsNum < $itineraryNums){
-					$orderInfo->topstatus = 'processing';
-					array_push($returnData->processing,$orderInfo);
 				}
 			}
 			print_r(json_encode($returnData));
diff --git a/application/third_party/trainsystem/models/BIZ_train_model.php b/application/third_party/trainsystem/models/BIZ_train_model.php
index be7d4f72..416ec613 100644
--- a/application/third_party/trainsystem/models/BIZ_train_model.php
+++ b/application/third_party/trainsystem/models/BIZ_train_model.php
@@ -458,7 +458,7 @@ class BIZ_train_model extends CI_Model {
 	
 	//根据订单号获取所有子订单号
 	public function getAllColdSn($coliId){
-		$sql = "select cold_sn from BIZ_ConfirmLineInfo left join BIZ_ConfirmLineDetail on coli_sn = cold_coli_sn where coli_id = ? and COLI_servicetype = '2'";
+		$sql = "select cold_sn,COLI_ApplyDate from BIZ_ConfirmLineInfo left join BIZ_ConfirmLineDetail on coli_sn = cold_coli_sn where coli_id = ? and COLI_servicetype = '2'";
 		$query = $this->HT->query($sql, array($coliId));
 		return $query->result();
 	}

From 0e2950717227601243e00182a5af649a36056354 Mon Sep 17 00:00:00 2001
From: cyc <cyc@hainatravel.com>
Date: Wed, 27 May 2020 15:45:59 +0800
Subject: [PATCH 15/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=82=AE=E7=AE=B1?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/third_party/trainsystem/controllers/api.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/application/third_party/trainsystem/controllers/api.php b/application/third_party/trainsystem/controllers/api.php
index 6d75d804..bd893361 100644
--- a/application/third_party/trainsystem/controllers/api.php
+++ b/application/third_party/trainsystem/controllers/api.php
@@ -90,9 +90,7 @@ class api extends CI_Controller{
 					foreach ($coldSnArr as $keyColdSn=>$itemColdSn){
 						$train_info = $this->BIZ_train_model->biz_order_detail($itemColdSn->cold_sn);
 						
-						//todo 计算是否有逾期车程，扣除逾期车程，计算价格变动
 						$today = time();
-						
 						if(strtotime($itemColdSn->COLI_ApplyDate) - $today < 86400){
 							$orderInfo->totalPrice = $orderInfo->totalPrice - 0;
 							continue;
@@ -221,7 +219,7 @@ class api extends CI_Controller{
 		$fromEmail = "cyc@hainatravel.com";
 		if(empty($coli_id)){
 			$toName = 'Sharon';
-			$toEmail = 'Sharon@hainatravel.com';
+			$toEmail = 'sharon@chinahighlights.com';
 			$fromEmail = $this->input->get_post('concatEmail');
 			$body = $this->input->get_post('addrequest');
 			if(empty($fromEmail) && empty($body)){
@@ -270,7 +268,7 @@ class api extends CI_Controller{
 		$body .= '详细信息：'.$request.'<br>';
 		
 		$toName = 'Sharon';
-		$toEmail = 'Sharon@hainatravel.com';
+		$toEmail = 'sharon@chinahighlights.com';
 		$subject = '用户中心操作';
 		
 		$obj = $this->Sendmail_model->SendMailToTable($fromName,$fromEmail,$toName,$toEmail,$subject,$body);

From 8bddd5531186ce8feb636a3986d9cd1a3b35b93c Mon Sep 17 00:00:00 2001
From: cyc <cyc@hainatravel.com>
Date: Wed, 27 May 2020 16:24:02 +0800
Subject: [PATCH 16/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=87=E6=9C=9F?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/third_party/trainsystem/controllers/api.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/third_party/trainsystem/controllers/api.php b/application/third_party/trainsystem/controllers/api.php
index bd893361..ce23b945 100644
--- a/application/third_party/trainsystem/controllers/api.php
+++ b/application/third_party/trainsystem/controllers/api.php
@@ -91,7 +91,7 @@ class api extends CI_Controller{
 						$train_info = $this->BIZ_train_model->biz_order_detail($itemColdSn->cold_sn);
 						
 						$today = time();
-						if(strtotime($itemColdSn->COLI_ApplyDate) - $today < 86400){
+						if(strtotime($itemColdSn->COLI_ApplyDate) - $today < 259200){
 							$orderInfo->totalPrice = $orderInfo->totalPrice - 0;
 							continue;
 						}

From 2c69fca2ec756eab92b14d0cc25c7d020255e422 Mon Sep 17 00:00:00 2001
From: cyc <cyc@hainatravel.com>
Date: Thu, 28 May 2020 14:32:29 +0800
Subject: [PATCH 17/17] =?UTF-8?q?=E6=B7=BB=E5=8A=A0sql=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../third_party/train/models/BIZ_train_model.php  | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/application/third_party/train/models/BIZ_train_model.php b/application/third_party/train/models/BIZ_train_model.php
index 6e809f90..754a0fdb 100644
--- a/application/third_party/train/models/BIZ_train_model.php
+++ b/application/third_party/train/models/BIZ_train_model.php
@@ -698,4 +698,19 @@ class BIZ_train_model extends CI_Model {
 		 $query = $this->HT->query($sql);
 		 
 	 }
+	 
+	 public function get_price($fromStationCode,$toStationCode,$trainCode){
+		$sql = "SELECT 
+					TPL_Price 
+				FROM 
+					TrainPriceList 
+				WHERE 
+					TPL_Train_Code = '$trainCode'
+				AND 
+					TPL_From_Station_Code = '$fromStationCode'
+				AND	
+					TPL_To_Station_Code = '$toStationCode'";
+		$query = $this->INFO->query($sql);		
+		return $query->row();
+	}
 }