From 3072931a4656b6dcae4be78da602868966d84c47 Mon Sep 17 00:00:00 2001
From: lyt <lyt@hainatravel.com>
Date: Wed, 26 Jun 2019 11:09:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E6=8E=A5=E8=AE=A1=E5=88=92:=E5=AE=A2?=
 =?UTF-8?q?=E4=BA=BA=E4=BF=A1=E6=81=AF=E5=8F=AA=E7=95=99=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?=E4=BA=BA=E7=9A=84=E7=94=B5=E8=AF=9D;=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=80=A7=E5=88=AB=E8=A1=A5=E5=85=85=E5=9C=A8=E5=85=B6=E4=BB=96?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vendorPlanSync/libraries/Tulanduo.php          | 14 +++++++++++++-
 .../vendorPlanSync/models/BIZ_orders_model.php     |  2 +-
 .../vendorPlanSync/models/orders_model.php         |  2 +-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/webht/third_party/vendorPlanSync/libraries/Tulanduo.php b/webht/third_party/vendorPlanSync/libraries/Tulanduo.php
index c52b3567..2c026d5f 100644
--- a/webht/third_party/vendorPlanSync/libraries/Tulanduo.php
+++ b/webht/third_party/vendorPlanSync/libraries/Tulanduo.php
@@ -220,11 +220,14 @@ class Tulanduo
             }
             $from_country = ""; // 客源地
             if ($guestlist===null) {
+                // 商务订单的客人列表
                 $g_cold_str = array_map(function ($ele){return $ele->GRD_COLD_SN;}, $vo['details']);
                 $guestlist = $this->ci->BIZ_order->get_guestlist(implode(',',$g_cold_str));
                 $from_country = current(array_filter(array_map(function ($ele){return $ele->Country;},$guestlist)));
+                // 联系人
+                $biz_contact = $this->ci->BIZ_order->get_customer_contact(implode(',',$g_cold_str));
+                $guestlist[0]->phone = $biz_contact->phone;
                 if (strval($from_country)==='') {
-                    $biz_contact = $this->ci->BIZ_order->get_customer_contact(implode(',',$g_cold_str));
                     $from_country = $biz_contact->Country;
                 }
             }
@@ -239,6 +242,9 @@ class Tulanduo
                     $from_country = $vg->Country;
                     $this_otherinfo .= $vg->Country;
                 }
+                if (strval($vg->Gender) !== '') {
+                    $this_otherinfo .= "; " . $vg->Gender;
+                }
                 if (strval($vg->BirthDay) !== '') {
                     $this_otherinfo .= "; 生日:". $vg->BirthDay;
                 }
@@ -470,6 +476,9 @@ class Tulanduo
                     $from_country = $vg->Country;
                     $this_otherinfo .= $vg->Country;
                 }
+                if (strval($vg->Gender) !== '') {
+                    $this_otherinfo .= "; " . $vg->Gender;
+                }
                 if (strval($vg->BirthDay) !== '') {
                     $this_otherinfo .= "; 生日:". $vg->BirthDay;
                 }
@@ -765,6 +774,9 @@ class Tulanduo
                     $from_country = $vg->Country;
                     $this_otherinfo .= "; " . $vg->Country;
                 }
+                if (strval($vg->Gender) !== '') {
+                    $this_otherinfo .= "; " . $vg->Gender;
+                }
                 if (strval($vg->BirthDay) !== '') {
                     $this_otherinfo .= "; 生日:". $vg->BirthDay;
                 }
diff --git a/webht/third_party/vendorPlanSync/models/BIZ_orders_model.php b/webht/third_party/vendorPlanSync/models/BIZ_orders_model.php
index a718d921..c7f56fc3 100644
--- a/webht/third_party/vendorPlanSync/models/BIZ_orders_model.php
+++ b/webht/third_party/vendorPlanSync/models/BIZ_orders_model.php
@@ -397,7 +397,7 @@ return ;
                 isnull(GUT_FirstName,'') + ' '+isnull(GUT_LastName,'') as MemberName,
                 '' as BirthDay,
                 '' as Gender,
-                GUT_MoveTel as phone,
+                isnull(GUT_POST ,'') + ' ' + isnull(GUT_tel,'') + isnull(GUT_MoveTel,'') as phone,
                 (select COI2_Country from V_Country_Info
                     where LGC_LGC = 2
                         and COI_SN = GUT_NationalityID
diff --git a/webht/third_party/vendorPlanSync/models/orders_model.php b/webht/third_party/vendorPlanSync/models/orders_model.php
index 02412028..3814771c 100644
--- a/webht/third_party/vendorPlanSync/models/orders_model.php
+++ b/webht/third_party/vendorPlanSync/models/orders_model.php
@@ -27,7 +27,7 @@ class Orders_model extends CI_Model {
                     where LGC_LGC = 2
                         and COI_SN in (select MEI_Country from MemberInfo where MEI_SN=CUL_CUI_SN)
                 ) as Country,
-                MEI_Phone phone,
+                CASE isnull(CUL_IsLinkMan,0) WHEN 1 THEN MEI_Phone ELSE '' END AS phone,
                 MEI_PassportNo PassportNo,
                 MEI_PassportValidDate PassportValidDate
                 -- (select MEI_PassportNo from MemberInfo where MEI_SN=CUL_CUI_SN) PassportNo,