diff --git a/application/third_party/trainsystem/controllers/addorders.php b/application/third_party/trainsystem/controllers/addorders.php
index bd5ffb84..7adba09d 100644
--- a/application/third_party/trainsystem/controllers/addorders.php
+++ b/application/third_party/trainsystem/controllers/addorders.php
@@ -833,9 +833,9 @@ class addorders extends CI_Controller{
$passagersdata[$i]->passengerType = $PiaoType;
$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]->certificateName = chk_sp_name($PassagerInfo->BPE_FirstName.' '.$PassagerInfo->BPE_MiddleName.' '.$PassagerInfo->BPE_LastName);
$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]->realName = chk_sp_name($PassagerInfo->BPE_FirstName.' '.$PassagerInfo->BPE_MiddleName.' '.$PassagerInfo->BPE_LastName);
$passagersdata[$i]->identityLimitDate = date('Y-m-d',strtotime($PassagerInfo->BPE_PassExpdate));
$passagersdata[$i]->countryCode = "";
$passagersdata[$i]->contactMobile = "";
diff --git a/application/third_party/trainsystem/controllers/lanhaiticket.php b/application/third_party/trainsystem/controllers/lanhaiticket.php
index a028b447..f871f04a 100644
--- a/application/third_party/trainsystem/controllers/lanhaiticket.php
+++ b/application/third_party/trainsystem/controllers/lanhaiticket.php
@@ -130,7 +130,7 @@ class LanHaiTicket extends CI_Controller
}
$passagersdata[$i] = new stdClass();
- $passagersdata[$i]->passengerName = chk_sp_name($PassagerInfo->BPE_FirstName . $PassagerInfo->BPE_MiddleName . $PassagerInfo->BPE_LastName);
+ $passagersdata[$i]->passengerName = chk_sp_name($PassagerInfo->BPE_FirstName .' '. $PassagerInfo->BPE_MiddleName .' '. $PassagerInfo->BPE_LastName);
$passagersdata[$i]->passengerType = $PiaoType; //乘客类型，1 成人票，2 儿童票
$passagersdata[$i]->passportType = $PassportTypeseId; //证件类型，身份证 1，护照 2，回乡证 7，台胞证 8，外国人永久居留身份证 9，港澳通行证 10，台湾通行证 22，港澳台居民居住证 23
$passagersdata[$i]->passportNumber = $PassagerInfo->BPE_Passport; //护照号
diff --git a/application/third_party/trainsystem/controllers/pages.php b/application/third_party/trainsystem/controllers/pages.php
index b5302725..dfa88022 100644
--- a/application/third_party/trainsystem/controllers/pages.php
+++ b/application/third_party/trainsystem/controllers/pages.php
@@ -90,26 +90,36 @@ class pages extends CI_Controller{
$order = $this->input->get("order");
$web_code = $this->input->get("web_code");
$channel = $this->input->get("channel");
+ $list["channel"] = ""; //初始化
+ $operater = $this->input->get("operater");
+ $list["operater"] = ""; //初始化
$where = "1=1";//搜索条件
$page_parameter = "";//返回的分页条件参数
if(empty($page) or !is_numeric($page)){
$page=0;
}
if(!empty($order)){
- $where = "BIZ_ConfirmLineInfo.COLI_ID='{$order}' OR InfoManager.dbo.trainsystem.ts_ordernumber='{$order}' OR InfoManager.dbo.trainsystem.ts_elecnumber='{$order}'";
+ $where .= " and (BIZ_ConfirmLineInfo.COLI_ID='{$order}' OR InfoManager.dbo.trainsystem.ts_ordernumber='{$order}' OR InfoManager.dbo.trainsystem.ts_elecnumber='{$order}')";
//$where2 = "where BIZ_ConfirmLineInfo.COLI_ID='{$order}' OR JOL_JuheOrder='{$order}'";
$list["order"] = $order;
$page_parameter = "order=".$order;
}
if(!empty($web_code)){
- $where = "BIZ_ConfirmLineInfo.COLI_WebCode='{$web_code}'";
+ $where .= " and (BIZ_ConfirmLineInfo.COLI_WebCode='{$web_code}')";
$page_parameter = "web_code=".$web_code;
}
if (!empty($channel)){
- $where = " InfoManager.dbo.trainsystem.ts_channel='{$channel}' ";
+ $where .= " and (InfoManager.dbo.trainsystem.ts_channel='{$channel}') ";
+ $list["channel"] = $channel;
$page_parameter = " channel=".$channel;
}
+
+ if (!empty($operater)){
+ $where .= " and ((select top 1 OPI2_Name from OperatorInfo2 where OPI2_OPI_SN = coli_opi_id and OPI2_LGC=2) ='".$operater."') ";
+ $list["operater"] = $operater;
+ $page_parameter = " operater=".$operater;
+ }
//获取订单数据
$data = $this->train_system_model->get_order($page_size,$page,$where);
diff --git a/application/third_party/trainsystem/helpers/train_helper.php b/application/third_party/trainsystem/helpers/train_helper.php
index c2396ed5..2cb78011 100644
--- a/application/third_party/trainsystem/helpers/train_helper.php
+++ b/application/third_party/trainsystem/helpers/train_helper.php
@@ -39,7 +39,7 @@ function chk_sp_name($name){
array('a','e','e','e','i','o','u','u','n','A','E','I','o','o','U','U','N','','',''),
$name
);
- return substr(strtoupper($name),0,30);
+ return trim(substr(strtoupper($name),0,50));
}
//发送请求函数
diff --git a/application/third_party/trainsystem/views/order_list.php b/application/third_party/trainsystem/views/order_list.php
index 9050b2dd..68fd66ec 100644
--- a/application/third_party/trainsystem/views/order_list.php
+++ b/application/third_party/trainsystem/views/order_list.php
@@ -22,9 +22,17 @@
+
+
+