Merge branch 'feature/plan-auto-send-release'

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;
                 }

webht/third_party/vendorPlanSync/models/BIZ_orders_model.php

@@ -393,7 +393,7 @@ class BIZ_Orders_model extends CI_Model {
                 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

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,