diff --git a/application/third_party/trainsystem/controllers/addorders.php b/application/third_party/trainsystem/controllers/addorders.php index 87151452..5bb18194 100644 --- a/application/third_party/trainsystem/controllers/addorders.php +++ b/application/third_party/trainsystem/controllers/addorders.php @@ -790,6 +790,10 @@ class addorders extends CI_Controller{ $passagersdata[$i]->countryCode = ""; $passagersdata[$i]->contactMobile = ""; $passagersdata[$i]->contactEmail = ""; + if (!empty($PassagerInfo->BPE_Nationality)){ + $passagersdata[$i]->regionCode = $PassagerInfo->BPE_Nationality; //国家简码 美国us ,中国cn + } + $i++; } //乘客人信息 diff --git a/application/third_party/trainsystem/controllers/pages.php b/application/third_party/trainsystem/controllers/pages.php index 35bb6d95..b4c46a50 100644 --- a/application/third_party/trainsystem/controllers/pages.php +++ b/application/third_party/trainsystem/controllers/pages.php @@ -55,14 +55,15 @@ class pages extends CI_Controller{ $list->cols_id=$cols_id; } - //查询聚合余额 - $back_data = GetPost_http("http://op.juhe.cn/trainTickets/balance.php?key=79f03107b921ef31310bd40a1415c1cb"); - $back_data = json_decode($back_data); - if(!empty($back_data->result)){ - $list->balance = $back_data->result; - }else{ - $list->balance = "NULL"; - } + // //查询聚合余额 + // $back_data = GetPost_http("http://op.juhe.cn/trainTickets/balance.php?key=79f03107b921ef31310bd40a1415c1cb"); + // $back_data = json_decode($back_data); + // if(!empty($back_data->result)){ + // $list->balance = $back_data->result; + // }else{ + // $list->balance = "NULL"; + // } + $list->balance = "NULL"; // print_r(json_encode($list)); $this->load->view('common/header'); $this->load->view('homepage',$list); diff --git a/application/third_party/trainsystem/models/BIZ_train_model.php b/application/third_party/trainsystem/models/BIZ_train_model.php index 8f561894..040b5437 100644 --- a/application/third_party/trainsystem/models/BIZ_train_model.php +++ b/application/third_party/trainsystem/models/BIZ_train_model.php @@ -23,6 +23,7 @@ class BIZ_train_model extends CI_Model { ,(case ISDATE(BPE_PassExpdate) when 1 then CONVERT(VARCHAR(10),CONVERT(datetime,BPE_PassExpdate,120),120) else null end) as BPE_PassExpdate + ,(select top 1 COI_Code from COuntryInfo where COI_SN=bbp.BPE_Nationality) as BPE_Nationality FROM BIZ_BookPeople bbp WHERE BPE_SN in(".$bpe_sn.") "; @@ -55,6 +56,8 @@ class BIZ_train_model extends CI_Model { ,(case ISDATE(BPE_PassExpdate) when 1 then CONVERT(VARCHAR(10),CONVERT(datetime,BPE_PassExpdate,120),120) else null end) as BPE_PassExpdate + ,(select top 1 COI_Code from COuntryInfo where COI_SN=bbp.BPE_Nationality) as BPE_Nationality + ,(select top 1 COI_ID from COuntryInfo where COI_SN=bbp.BPE_Nationality) as Nationality FROM BIZ_BookPeople bbp WHERE EXISTS( SELECT TOP 1 1 diff --git a/application/third_party/trainsystem/views/homepage.php b/application/third_party/trainsystem/views/homepage.php index 0d0db302..096ec0f8 100644 --- a/application/third_party/trainsystem/views/homepage.php +++ b/application/third_party/trainsystem/views/homepage.php @@ -137,6 +137,7 @@ function selseat(seat){