From 5ae28c8d0e1150d8368ce650f9a6c75f82ec56e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= <zhaopeng@hainatravel.com>
Date: Wed, 13 Mar 2024 09:21:48 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=BA=E9=80=94=E6=8E=A5=E5=8F=A3=E5=8D=87?=
 =?UTF-8?q?=E7=BA=A7=EF=BC=8C=E6=A0=B9=E6=8D=AE=E8=A6=81=E6=B1=82=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E4=BA=BA=E5=91=98=E5=9B=BD=E7=B1=8D=E7=9A=84=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trainsystem/controllers/addorders.php       |  4 ++++
 .../trainsystem/controllers/pages.php           | 17 +++++++++--------
 .../trainsystem/models/BIZ_train_model.php      |  3 +++
 .../third_party/trainsystem/views/homepage.php  |  2 ++
 4 files changed, 18 insertions(+), 8 deletions(-)

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){
                     <th style="text-align:center;">年龄类型</th>
                     <th style="text-align:center;">出生年月</th>
                     <th style="text-align:center;">证件有效期</th>
+                    <th style="text-align:center;">国籍</th>
                   </tr>
                 </thead>
                 <tbody>
@@ -153,6 +154,7 @@ function selseat(seat){
                     <td><?php echo $p->BPE_GuestType==1?"成人":($p->BPE_GuestType==2?"儿童":"婴儿");?></td>
                     <td><?php echo $p->BPE_BirthDate;?></td>
                     <td><?php echo $p->BPE_PassExpdate;?></td>
+                    <td><?php  echo $p->Nationality . "(".$p->BPE_Nationality .")"; ?></td>
                   </tr>
                   <?php endforeach;?>
 				  <tr style="text-align:;">