From 6a79badf2fee5c0eeb5634a48dcadf4acc2b9152 Mon Sep 17 00:00:00 2001
From: lyt <lyt@hainatravel.com>
Date: Tue, 25 Jun 2019 17:57:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E6=8E=A5=E8=AE=A1=E5=88=92:=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E7=94=9F=E6=97=A5,=E5=9B=BD=E7=B1=8D,=20=E6=8A=A4?=
 =?UTF-8?q?=E7=85=A7=E6=9C=89=E6=95=88=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vendorPlanSync/libraries/Tulanduo.php     | 30 +++++++++++++++++--
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/webht/third_party/vendorPlanSync/libraries/Tulanduo.php b/webht/third_party/vendorPlanSync/libraries/Tulanduo.php
index bfa3631b..50bd80c8 100644
--- a/webht/third_party/vendorPlanSync/libraries/Tulanduo.php
+++ b/webht/third_party/vendorPlanSync/libraries/Tulanduo.php
@@ -155,7 +155,7 @@ class Tulanduo
         $destination = $grd['details'][0]->tocity;
         $destination_code = $grd['details'][0]->citycode;
         if (empty($destination)) {
-            $vendor_city = $this->Group_model->get_vendor_city($vas->VAS_VEI_SN);
+            $vendor_city = $this->ci->Group_model->get_vendor_city($vas->VAS_VEI_SN);
             $destination = $vendor_city->cityname;
             $destination_code = $vendor_city->citycode;
         }
@@ -229,6 +229,7 @@ class Tulanduo
                 }
             }
             foreach ($guestlist as $key => $vg) {
+                $this_otherinfo = "";
                 $this->ci->tldOrderBuilder->setCustomersName($key, $vg->MemberName )
                                         ->setCustomersPeopleType($key, (calc_age_type($vg->BirthDay)==1 ? "成人" : "儿童"))
                                         ->setCustomersDocumentType($key, "护照") // Passport No.
@@ -236,7 +237,15 @@ class Tulanduo
                                         ->setCustomersPhoneNo($key, $vg->phone);
                 if (strval($vg->Country) !== '' && strval($from_country) === '') {
                     $from_country = $vg->Country;
+                    $this_otherinfo .= $vg->Country;
+                }
+                if (strval($vg->BirthDay) !== '') {
+                    $this_otherinfo .= "; 生日:". $vg->BirthDay;
                 }
+                if (strval($vg->PassportValidDate) !== '') {
+                    $this_otherinfo .= "; 护照有效期:" . $vg->PassportValidDate;
+                }
+                $this->ci->tldOrderBuilder->setCustomersOtherInfo($key, $this_otherinfo);
             }
             // 客源地
             $this->ci->tldOrderBuilder->setCustomerFromCity($from_country);
@@ -451,7 +460,7 @@ class Tulanduo
             // 客人列表
             $from_country = ""; // 客源地
             foreach ($train_guest_list as $key => $vg) {
-                // $this_otherinfo = "";
+                $this_otherinfo = "";
                 $this->ci->tldOrderBuilder->setCustomersName($key, $vg->MemberName )
                                       ->setCustomersPeopleType($key, ($vg->BPE_GuestType==1 ? "成人" : "儿童"))
                                       ->setCustomersDocumentType($key, "护照") // Passport No.
@@ -459,8 +468,15 @@ class Tulanduo
                                       ;
                 if (strval($vg->Country) !== '' && strval($from_country) === '') {
                     $from_country = $vg->Country;
+                    $this_otherinfo .= $vg->Country;
                 }
-                // $this_otherinfo .= $this->ci->BIZ_order->GetNationalityName($vg->BPE_Nationality);
+                if (strval($vg->BirthDay) !== '') {
+                    $this_otherinfo .= "; 生日:". $vg->BirthDay;
+                }
+                if (strval($vg->PassportValidDate) !== '') {
+                    $this_otherinfo .= "; 护照有效期:" . $vg->PassportValidDate;
+                }
+                $this->ci->tldOrderBuilder->setCustomersOtherInfo($key, $this_otherinfo);
                 // todo:电话
                 // if (trim($vf['cold'][0]->GUT_TEL) != "" && $key===0) {
                 //     $this_otherinfo .= "; 电话:";
@@ -747,7 +763,15 @@ class Tulanduo
                 }
                 if (strval($from_country) === '' && strval($vg->Country) !== '') {
                     $from_country = $vg->Country;
+                    $this_otherinfo .= "; " . $vg->Country;
+                }
+                if (strval($vg->BirthDay) !== '') {
+                    $this_otherinfo .= "; 生日:". $vg->BirthDay;
+                }
+                if (strval($vg->PassportValidDate) !== '') {
+                    $this_otherinfo .= "; 护照有效期:" . $vg->PassportValidDate;
                 }
+                $this->ci->tldOrderBuilder->setCustomersOtherInfo($key, $this_otherinfo);
             }
             if (strval($from_country)==='') {
                 $biz_contact = $this->ci->BIZ_order->get_customer_contact($COLD_SN_str);