From 93f78996b3b549951f68d9f21e7e133d2cce7ba8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= <zhaopeng@hainatravel.com>
Date: Wed, 26 Apr 2023 10:22:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=90=BA=E7=A8=8B=E7=9A=84?=
 =?UTF-8?q?=E4=B8=80=E7=AD=89=E5=8D=A7=E5=92=8C=E4=BA=8C=E7=AD=89=E5=8D=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trainsystem/controllers/innerTrainSearch.php   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/application/third_party/trainsystem/controllers/innerTrainSearch.php b/application/third_party/trainsystem/controllers/innerTrainSearch.php
index 31669b11..7844ffb5 100644
--- a/application/third_party/trainsystem/controllers/innerTrainSearch.php
+++ b/application/third_party/trainsystem/controllers/innerTrainSearch.php
@@ -331,7 +331,7 @@ class innerTrainSearch extends CI_Controller{
 							$rwNum = $Seats->ticketLeft;
 						}
 
-						if($Seats->seatName == '一等双软上'){
+						if($Seats->seatName == '一等双软上' || $seats->seatName=='一等卧'){
 							$SeaType .= '"YDW":"¥'.$Seats->maxPrice.'",';
 							$ydwNum = $Seats->ticketLeft;
 						}
@@ -380,7 +380,7 @@ class innerTrainSearch extends CI_Controller{
 							$ywNum = $Seats->ticketLeft;
 						}
 
-						if($Seats->seatName == '二等双软上'){
+						if($Seats->seatName == '二等双软上' || $Seats->seatName == '二等卧'){
 							$SeaType .= '"EDW":"¥'.$Seats->maxPrice.'",';
 							$erwNum = $Seats->ticketLeft;
 						}
@@ -572,12 +572,12 @@ class innerTrainSearch extends CI_Controller{
 		$TimeStamp = date("Y-m-d H:i:s");
 		//$TimeStamp = time();
 		$serviceName = "train.getAllStations";
-		// $companyId = "4003171843";
-		// $key = "hajkrtbc";
+		$companyId = COMPANYID;
+		$key = CTRIPKEY;
 
-		/** 测试服务器 */
-		$companyId = "1503141150";
-		$key = "hajkrtbcc";
+		// /** 测试服务器 */
+		// $companyId = "1503141150";
+		// $key = "hajkrtbcc";
 
 
 		$strSign = $TimeStamp.$serviceName.$companyId.$key;