火车票fix

application/config/config.php

@@ -430,9 +430,9 @@ $config['site'] = [
   'shanghai' => ['site_code' => 'shanghai', 'site_id' => 96, 'site_lgc' => '107', 'site_url' => 'https://www.shanghaihighlights.com', 'site_image_url' => 'https://images.shanghaihighlights.com', 'site_authors' => ['ll', 'D'], 'site_user' => ',ycc,vz,bhn,J,wj,ll,D,ZP,lyy,'],
   'beijing' => ['site_code' => 'beijing', 'site_id' => 98, 'site_lgc' => '106', 'site_url' => 'https://www.mybeijingchina.com', 'site_image_url' => 'https://images.mybeijingchina.com', 'site_authors' => ['ll', 'D'], 'site_user' => ',ycc,vz,bhn,J,wj,ll,D,ZP,lyy,'],
   'trainspread' => ['site_code' => 'trainspread', 'site_id' => 149, 'site_lgc' => '1', 'site_url' => 'https://www.trainspread.com', 'site_image_url' => 'https://images.trainspread.com', 'site_authors' => ['ll', 'D'], 'site_user' => ',ycc,vz,bhn,J,wj,ll,D,ZP,lyy,'],
-  'guilin' => ['site_code' => 'guilin', 'site_id' => 90, 'site_lgc' => '103', 'site_url' => 'https://www.guilinchina.net/', 'site_image_url' => 'https://images.guilinchina.net', 'site_authors' => ['ll', 'D'], 'site_user' => ',ycc,vz,bhn,J,wj,ll,D,ZP,lyy,'],
+  'guilin' => ['site_code' => 'guilin', 'site_id' => 90, 'site_lgc' => '103', 'site_url' => 'https://www.guilinchina.net', 'site_image_url' => 'https://images.guilinchina.net', 'site_authors' => ['ll', 'D'], 'site_user' => ',ycc,vz,bhn,J,wj,ll,D,ZP,lyy,'],
-  'hly' => ['site_code' => 'hly', 'site_id' => 151, 'site_lgc' => '2', 'site_url' => 'https://www.hualiyingtravel.com/', 'site_image_url' => 'https://images.hualiyingtravel.com', 'site_authors' => ['ll', 'D'], 'site_user' => ',ycc,vz,bhn,J,wj,ll,D,ZP,lyy,'],
+  'hly' => ['site_code' => 'hly', 'site_id' => 151, 'site_lgc' => '2', 'site_url' => 'https://www.hualiyingtravel.com', 'site_image_url' => 'https://images.hualiyingtravel.com', 'site_authors' => ['ll', 'D'], 'site_user' => ',ycc,vz,bhn,J,wj,ll,D,ZP,lyy,'],
-  'hlyen' => ['site_code' => 'hlyen', 'site_id' => 151, 'site_lgc' => '1', 'site_url' => 'https://www.chiangmaiyipengfestival.com/', 'site_image_url' => 'https://images.chiangmaiyipengfestival.com', 'site_authors' => ['ll', 'D'], 'site_user' => ',ycc,vz,bhn,J,wj,ll,D,ZP,lyy,'],
+  'hlyen' => ['site_code' => 'hlyen', 'site_id' => 151, 'site_lgc' => '1', 'site_url' => 'https://www.chiangmaiyipengfestival.com', 'site_image_url' => 'https://images.chiangmaiyipengfestival.com', 'site_authors' => ['ll', 'D'], 'site_user' => ',ycc,vz,bhn,J,wj,ll,D,ZP,lyy,'],
   'cht' => ['site_code' => 'cht', 'site_id' => 14, 'site_lgc' => '1', 'site_url' => 'https://www.chinahighlights.com', 'site_image_url' => 'https://images.chinahighlights.com', 'site_authors' => ['zzy', 'spt', 'yl', 'gavin', 'sw', 'zl', 'wbl', 'yqw', 'lf', 'zhm', 'pkl'], 'site_user' => ',ycc,lmr, zyh,J,shw,B,zzy,WJJ,Tony,pcf,zxy,wst,wz,v,S,yyg,yxd,wj,sw,yl,hx,spt,wmr,zl,syt,gavin,zm,htc,yqw,bhn,lmj,wbl,yqw,LYY,zhm,si'],
 ];
 

application/third_party/trainsystem/controllers/addorders.php

@@ -299,7 +299,8 @@ class addorders extends CI_Controller{
 				log_message('error','自动出票提交：'.$coli_id.'('.$cold_sn.')');		
 
 				//判断使用哪个供应商的出票
-				$autoUse = "ctrip"; //默认携程
+				//$autoUse = "ctrip"; //默认携程
+				$autoUse = "lanhai"; //默认澜海
 				$wl = $this->BIZ_train_model->get_operatorInfo($coli_id);
 				$lastChar = substr($coli_id, -1);
 				$firstChar = strtoupper(substr(trim($coli_id), 0, 1)); //订单首字母
@@ -372,11 +373,15 @@ class addorders extends CI_Controller{
 		if($selectseat == ''){
 			$selectseat = '';
 			$train_select = $data['train']->FOI_SelectedSeat;
+			if ($type=="ctrip"){
+				$selectseat = $data['train']->FOI_SelectedSeat;
+			}else{
 				$obj = explode(',',$train_select);
 				foreach($obj as $value){
 					$selectseat .= $value;
 				}
 			}
+		}
 		
 		if (empty($data['train'])) {
             //显示错误,找不到车次
@@ -1242,7 +1247,7 @@ class addorders extends CI_Controller{
 			$passagersdata[$i] = new stdClass();
 			$passagersdata[$i]->passengerType = $PiaoType;
 			$passagersdata[$i]->certificateType = $PassportTypeseId;
-			$passagersdata[$i]->certificateNo = des_encrypt($PassagerInfo->BPE_Passport,$key);;
+			$passagersdata[$i]->certificateNo = $PassagerInfo->BPE_Passport; //des_encrypt($PassagerInfo->BPE_Passport,$key);
 			$passagersdata[$i]->certificateName = chk_sp_name($PassagerInfo->BPE_LastName.' '.$PassagerInfo->BPE_MiddleName.' '.$PassagerInfo->BPE_FirstName);
 			$passagersdata[$i]->birthday =date('Y-m-d',strtotime($PassagerInfo->BPE_BirthDate));
 			$passagersdata[$i]->realName = chk_sp_name($PassagerInfo->BPE_LastName.' '.$PassagerInfo->BPE_MiddleName.' '.$PassagerInfo->BPE_FirstName);
@@ -1331,6 +1336,7 @@ class addorders extends CI_Controller{
 		$ResponseJson = GetPost_http($url,json_encode($PostData,JSON_UNESCAPED_UNICODE),'json');		
 		$ResponseData = json_decode($ResponseJson);
 
+		//log_message('error','顺途提交数据记录：'.json_encode($PostData,JSON_UNESCAPED_UNICODE));
 		// print_r(json_encode($PostData));
 		// die();
 
@@ -1356,7 +1362,7 @@ class addorders extends CI_Controller{
 			
 
 		}else{
-			//log_message('error','下单失败提交数据记录：'.json_encode($PostData,JSON_UNESCAPED_UNICODE));
+			log_message('error','下单失败提交数据记录：'.json_encode($PostData,JSON_UNESCAPED_UNICODE));
 
 			$reback["mes"] = $ResponseJson;
             $add_data->status = "e";

application/third_party/trainsystem/controllers/callback.php

@@ -601,9 +601,12 @@ class callback extends CI_Controller{
 				if (isset( $ctrip_backdata->ticketResult->ticketSuccTime)){
 					$update_data->ticketSuccTime = $ctrip_backdata->ticketResult->ticketSuccTime;  //出票成功时间
 				}
+				if (isset($ctrip_backdata->ticketResult->orderMasterInfo)){
 					$update_data->orderType = $ctrip_backdata->ticketResult->orderMasterInfo->orderType; //订单类型 0电子票 1配送票 2人工客票 3抢票订单
 					$update_data->contactName = $ctrip_backdata->ticketResult->orderMasterInfo->contactName; //联系人
 					$update_data->mobileNo = des_decrypt($ctrip_backdata->ticketResult->orderMasterInfo->mobileNo,$key); //联系电话 (DES加密）
+				}
+
 				
 				//人员及车票
 				$data_passager = new stdClass();