fix

application/third_party/trainsystem/config/config.php

@@ -91,7 +91,8 @@ $config["train_zw"]=array(
                     "1"=>"硬座",
 					"F"=>"动卧",
 					"YDW"=>"一等卧",
-					"EDW"=>"二等卧"
+					"EDW"=>"二等卧",
+                    "WZ" =>"无座"
                     );
 //数据库座次配对,包厢硬卧(5),无座(WZ),聚合没有
 $config["db_train_zw"]=array(
@@ -109,6 +110,7 @@ $config["db_train_zw"]=array(
                     "3"=>"3",
                     "2"=>"2",
                     "1"=>"1",
+                    "13"=>"WZ",
 					"YDW"=>"YDW",
 					"EDW"=>"EDW"
                     );

application/third_party/trainsystem/controllers/addorders.php

@@ -585,12 +585,8 @@ class addorders extends CI_Controller{
 		//生成接口请求头参数
 		$TimeStamp = date("Y-m-d H:i:s");
 		$serviceName = "train.addTrainOrder"; //每个接口都有自己名称
-		// $companyId = "4003171843";
+		$companyId = COMPANYID;
-		// $key = "hajkrtbc";
+		$key = CTRIPKEY;
-
-		/** 测试服务器 */
-		$companyId = "1503141150";
-		$key = "hajkrtba";
 
 		$strSign = $TimeStamp.$serviceName.$companyId.$key; //加密前的令牌
 		$Sign = md5($strSign);
@@ -679,9 +675,9 @@ class addorders extends CI_Controller{
 			$passagersdata[$i]->certificateType = $PassportTypeseId;
 			$passagersdata[$i]->certificateNo = des_encrypt($PassagerInfo->BPE_Passport,$key);;
 			$passagersdata[$i]->certificateName = chk_sp_name($PassagerInfo->BPE_FirstName.$PassagerInfo->BPE_MiddleName.$PassagerInfo->BPE_LastName);
-			$passagersdata[$i]->birthday =$PassagerInfo->BPE_BirthDate;
+			$passagersdata[$i]->birthday =date('Y-m-d',strtotime($PassagerInfo->BPE_BirthDate));
 			$passagersdata[$i]->realName = chk_sp_name($PassagerInfo->BPE_FirstName.$PassagerInfo->BPE_MiddleName.$PassagerInfo->BPE_LastName);
-			$passagersdata[$i]->identityLimitDate = $PassagerInfo->BPE_PassExpdate;;
+			$passagersdata[$i]->identityLimitDate = date('Y-m-d',strtotime($PassagerInfo->BPE_PassExpdate));
 			$passagersdata[$i]->countryCode = "";
 			$passagersdata[$i]->contactMobile = "";
 			$passagersdata[$i]->contactEmail = "";
@@ -731,7 +727,8 @@ class addorders extends CI_Controller{
 		$ResponseJson = GetPost_http($url,json_encode($PostData,JSON_UNESCAPED_UNICODE),'json');		
 		$ResponseData = json_decode($ResponseJson);
 
-
+		// print_r(json_encode($PostData));
+		// die();
 
 		//预定请求成功后执行支付
 		if($ResponseData->returnCode == 1){

application/third_party/trainsystem/controllers/pages.php

@@ -15,9 +15,9 @@ class pages extends CI_Controller{
 	
 	//首页
 	public function index($coli_id = null){
-		if(get_cookie('dingname') == '' && get_cookie('dingunionid') == ''){
+		// if(get_cookie('dingname') == '' && get_cookie('dingunionid') == ''){
-			redirect('/apps/dinglogin/login/?returnurl=/apps/trainsystem/pages/');
+		// 	redirect('/apps/dinglogin/login/?returnurl=/apps/trainsystem/pages/');
-		}
+		// }
 		
 		if($coli_id == null){
 			$cols_id = $this->input->post("ht_order");
@@ -114,9 +114,9 @@ class pages extends CI_Controller{
 	
 	//订单详情页面
 	public function order(){
-		// if(get_cookie('dingname') == '' && get_cookie('dingunionid') == ''){
+		if(get_cookie('dingname') == '' && get_cookie('dingunionid') == ''){
-		// 	redirect('/apps/dinglogin/login/?returnurl=/apps/trainsystem/pages/');
+			redirect('/apps/dinglogin/login/?returnurl=/apps/trainsystem/pages/');
-		// }
+		}
 		$ordernumber = $order=$this->input->get("order");
 		
 		if(empty($ordernumber)){

application/third_party/trainsystem/models/BIZ_train_model.php

@@ -224,7 +224,9 @@ class BIZ_train_model extends CI_Model {
 							TOC_OtherCost,
 							TOC_VEI_SN
 							)
-						VALUES(?,getdate(),{$CCSN},?,?,?,?,(SELECT isnull(COLI_OPI_ID,29) FROM BIZ_ConfirmLineInfo WHERE COLI_SN={$CCSN}),null,?),(?,getdate(),{$CCSN},?,?,?,?,(SELECT isnull(COLI_OPI_ID,29) FROM BIZ_ConfirmLineInfo WHERE COLI_SN={$CCSN}),1,?)";
+						VALUES(?,getdate(),{$CCSN},?,?,?,?,(SELECT isnull(COLI_OPI_ID,29) FROM BIZ_ConfirmLineInfo WHERE COLI_SN={$CCSN}),null,?)";
+
+						//,(?,getdate(),{$CCSN},?,?,?,?,(SELECT isnull(COLI_OPI_ID,29) FROM BIZ_ConfirmLineInfo WHERE COLI_SN={$CCSN}),1,?)
 		$query = $this->HT->query($sql,array($data->TOC_COLD_SN,"%".$data->TOC_Memo."%",$data->TOC_Memo,$data->TOC_COLD_SN,$data->TOC_TrainNumber,$data->TOC_DepartureDate,$data->TOC_TicketCost,$data->TOC_VEI_SN,$data->TOC_Memo." 手续费",$data->TOC_COLD_SN,$data->TOC_TrainNumber,$data->TOC_DepartureDate,$data->poundage,$data->TOC_VEI_SN));			
 		
 		return $query;