diff --git a/application/third_party/trainsystem/controllers/addorders.php b/application/third_party/trainsystem/controllers/addorders.php
index 445c5b42..33ccfb2b 100644
--- a/application/third_party/trainsystem/controllers/addorders.php
+++ b/application/third_party/trainsystem/controllers/addorders.php
@@ -302,13 +302,21 @@ class addorders extends CI_Controller{
 				$autoUse = "ctrip"; //默认携程
 				$wl = $this->BIZ_train_model->get_operatorInfo($coli_id);
 				$lastChar = substr($coli_id, -1);
-				if ($lastChar!="M"){
+				$firstChar = strtoupper(substr(trim($coli_id), 0, 1)); //订单首字母
+				if ($firstChar=="N"){
 					if(!empty($wl)){
-						if($wl[0]->OPI_Name=="陈媛明"){
+						if($wl[0]->OPI_Name=="陈媛明" || $wl[0]->OPI_Name=="杜芳"){
 							$autoUse = "lanhai";
 						}
 					}
 				}
+				// if ($lastChar!="M"){
+				// 	if(!empty($wl)){
+				// 		if($wl[0]->OPI_Name=="陈媛明"){
+				// 			$autoUse = "lanhai";
+				// 		}
+				// 	}
+				// }
 				//$string .= '<tr><td>接口使用：'.$coli_id.'('.$cold_sn.')'.$autoUse.'</td></tr>';
 				$this->booktickets($cold_sn,$bpe_sn,'',$autoUse);  //调用出票
 				//$string .= '<tr><td>汉特订单号：'.$coli_id.'('.$cold_sn.')可以自动出票</td></tr>';
diff --git a/application/third_party/trainsystem/controllers/lanhaiticket.php b/application/third_party/trainsystem/controllers/lanhaiticket.php
index 79af8a51..b4e498bd 100644
--- a/application/third_party/trainsystem/controllers/lanhaiticket.php
+++ b/application/third_party/trainsystem/controllers/lanhaiticket.php
@@ -194,17 +194,49 @@ class LanHaiTicket extends CI_Controller
                         break;
                     }
                 }
-                $acceptSeatRemark = "优先出【同排ABCDF座】，无法满足可出任意座位，不接受站票";
-                if (($AdultNum + $ChildNum) > 1) {
-                    //多人时
-                    if (strstr($seatName, "卧")) {
-                        $acceptSeatRemark = "客人想要2张下铺，最好在同一房间。下铺不足时，至少保证在同一房间，否则不要出票";
+
+                //---行程座席要求规则 begin------------
+                $acceptSeatRemark = "所有乘客必须在同一车厢，无法满足则设置无票"; //默认
+                $countNum = $AdultNum+$ChildNum;
+                if ($countNum>1){
+                    if ($data['train']->FlightsNo!==null && is_string($data['train']->FlightsNo)){
+                        $flightNO_First= $data['train']->FlightsNo; //车次
+                        $TrainTypeFirst = strtoupper(substr(trim($flightNO_First), 0, 1)); //获取车次的第一个大写字母
+                        $Aircraft = trim($data['train']->Aircraft);                        //座位类型                                             
+                        if ($TrainTypeFirst=="T" || $TrainTypeFirst == "K" || $TrainTypeFirst=="Z"){ //普通车
+                            if ($Aircraft=="1"){  //硬座                               
+                                $acceptSeatRemark = "必须连座（以尾号012、567、34、89为连座标准";
+                            }else if ($Aircraft == "4" || $Aircraft == "S"){ //软卧
+                                $acceptSeatRemark = "必须同包厢（席位1、2、3、4是同包厢，以此类推）";
+                            }else if ($Aircraft == "3" || $Aircraft == "6"){ //硬卧,高级软卧
+                                $acceptSeatRemark = "必须同隔间（席位1和2是同隔间，3和4是同隔间，以此类推）";
+                            }
+                        }else if($TrainTypeFirst == "D" || $TrainTypeFirst == "G"){   //动车高铁
+                            if (($Aircraft=="O" || $Aircraft == "8") && $countNum==2){  //二等座  
+                                $acceptSeatRemark = "必须出同排DF、AB或BC，无法满足请无票，出错会造成赔款！";
+                            }else if(($Aircraft=="M" || $Aircraft == "7") && $countNum==2){    //一等座
+                                $acceptSeatRemark = "必须出同排AC或DF，无法满足请无票，出错会造成赔款！";
+                            }else if( $Aircraft == "9" && $countNum==2){    //商务座
+                                $acceptSeatRemark = "必须出同排AC，无法满足请无票，出错会造成赔款！";
+                            }  
+                        }   
+
                     }
-                } else {
-                    //单人时
                 }
+                
+
+                // if (($AdultNum + $ChildNum) > 1) {
+                //     //多人时
+                //     if (strstr($seatName, "卧")) {
+                //         $acceptSeatRemark = "客人想要2张下铺，最好在同一房间。下铺不足时，至少保证在同一房间，否则不要出票";
+                //     }
+                // } else {
+                //     //单人时
+                // }
 
                 $PostData->ticketsItems['0']->acceptSeatRemark = $acceptSeatRemark; //行程坐席要求
+                //-----行程座席要求 end----------
+
                 $PostData->ticketsItems['0']->ticketType = 1;
                 $PostData->ticketsItems['0']->passengerInfos = $passagersdata;
 
@@ -216,7 +248,7 @@ class LanHaiTicket extends CI_Controller
                 $aesUnit = new Security();
                 $resultData = $aesUnit->encryptData(json_encode($PostData));
 
-                //$resultData = $aesUnit->decryptData($resultData); //测试加解密是否正常。
+                $resultData = $aesUnit->decryptData($resultData); //测试加解密是否正常。
 
                 if ($aes == "false") {
                     //加个明文显示判断，用来检查数据