Merge branch 'master' of gitee.com:hainatravel/information-system

application/third_party/trainsystem/controllers/addorders.php

@@ -544,14 +544,15 @@ class addorders extends CI_Controller{
 		$OrderNumber = ORDERUSER.time();
 		//拼接发送的报文
 		$PostData = array();
-		$TimeStamp = time();
-		$time = date('Y-m-d H:i:s',$TimeStamp);
+		$time = date('Y-m-d H:i:s',time());
+		$PostData['Authentication'] = new stdClass();
 		$PostData['Authentication']->TimeStamp = $time;
 		$PostData['Authentication']->ServiceName = 'order.PartnerAddOrder';
 		$PostData['Authentication']->PartnerName = ORDERUSER;
 		$MessageIdentity = md5($time.'order.PartnerAddOrder'.ORDERKEY);
 		$PostData['Authentication']->MessageIdentity = $MessageIdentity;
 		
+		$PostData['TrainOrderService'] = new stdClass();
 		$PostData['TrainOrderService']->PartnerName = ORDERUSER;
 		$PostData['TrainOrderService']->Operation = '';
 		$PostData['TrainOrderService']->OrderType = '电子';
@@ -559,12 +560,14 @@ class addorders extends CI_Controller{
 		$PostData['TrainOrderService']->OrderNumber = $OrderNumber;
 		$PostData['TrainOrderService']->ChannelName = ORDERUSER;
 		
+		$PostData['TrainOrderService']->Order = new stdClass();
 		$PostData['TrainOrderService']->Order->OrderTime = $time;
 		$PostData['TrainOrderService']->Order->OrderMedia = 'pc';
 		$PostData['TrainOrderService']->Order->Insurance = 'N';
 		$PostData['TrainOrderService']->Order->Invoice = 'N';
 		$PostData['TrainOrderService']->Order->PrivateCustomization = '0';
 		
+		$PostData['TrainOrderService']->Order->TicketItem = new stdClass();
 		$PostData['TrainOrderService']->Order->TicketItem->FromStationName = $data['train']->DepartAirport_cn;
 		$PostData['TrainOrderService']->Order->TicketItem->ToStationName = $data['train']->ArrivalAirport_cn;
 		$PostData['TrainOrderService']->Order->TicketItem->TicketTime = date('Y-m-d H:i:s',strtotime($data['train']->DepartureTime));
@@ -640,6 +643,7 @@ class addorders extends CI_Controller{
 		
 		$PostData['TrainOrderService']->Order->FrontSeatFlag = '0';
 		
+		$PostData['TrainOrderService']->Order->User = new stdClass();
 		$PostData['TrainOrderService']->Order->User->UserID = '';
 		$PostData['TrainOrderService']->Order->User->UserName = 'guilintravel';
 		$PostData['TrainOrderService']->Order->User->userLoginName = 'guilintravel';

application/third_party/tripadvisor_spider/config/config.php

@@ -21,7 +21,8 @@ $config['tripadvisor_website'] = array(
 	'tp_Beijing' => 'https://www.tripadvisor.com/Attraction_Review-g294212-d4006739-Reviews{PAGENUM}-The_Trippest_Mini_Group_Tours-Beijing.html',
 	'tp_Xian' => 'https://www.tripadvisor.com/Attraction_Review-g298557-d10999897-Reviews{PAGENUM}-Xi_an_Trippest_Mini_Group_Tours-Xi_an_Shaanxi.html',
 	'tp_Shanghai' => 'https://www.tripadvisor.com/Attraction_Review-g308272-d6222868-Reviews{PAGENUM}-Shanghai_Trippest_Mini_Group_Tours-Shanghai.html',
-	'tp_Guilin' => 'https://www.tripadvisor.com/Attraction_Review-g298556-d14121459-Reviews{PAGENUM}-Trippest_Mini_Group_Tours-Guilin_Guangxi.html'
+	'tp_Guilin' => 'https://www.tripadvisor.com/Attraction_Review-g298556-d14121459-Reviews{PAGENUM}-Trippest_Mini_Group_Tours-Guilin_Guangxi.html',
+	'train' => 'https://www.tripadvisor.com/Attraction_Review-g298556-d16700226-Reviews-Train_Spread-Guilin_Guangxi.html'
 );
 
 

application/third_party/tripadvisor_spider/views/third_party_input.php

@@ -76,6 +76,7 @@
 										<option value="tp_Beijing">tp_Beijing</option>
 										<option value="tp_Shanghai">tp_Shanghai</option>
 										<option value="tp_Guilin">tp_Guilin</option>
+										<option value="train">train</option>
 									</select>
 								</div>
 								<div class="col-md-9">
@@ -100,6 +101,7 @@
 										<option value="tp_Beijing">tp_Beijing</option>
 										<option value="tp_Shanghai">tp_Shanghai</option>
 										<option value="tp_Guilin">tp_Guilin</option>
+										<option value="train">train</option>
 									</select>
 								</div>
 								<div class="col-md-9">