From 0cb628cdd1b27167e2edc2dbdf8b35cd5a59baeb Mon Sep 17 00:00:00 2001
From: lyt <lyt@hainatravel.com>
Date: Fri, 2 Aug 2019 09:23:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E6=8E=A5=E8=AE=A1=E5=88=92:=20?=
 =?UTF-8?q?=E5=A4=A7=E8=BD=A6=E6=B8=B8=E8=AE=BE=E4=B8=BA=E6=95=A3=E6=8B=BC?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 webht/third_party/vendorPlanSync/libraries/trippest.php | 6 +++++-
 webht/third_party/vendorPlanSync/models/Group_model.php | 4 ++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/webht/third_party/vendorPlanSync/libraries/trippest.php b/webht/third_party/vendorPlanSync/libraries/trippest.php
index e566e32e..8870ff87 100644
--- a/webht/third_party/vendorPlanSync/libraries/trippest.php
+++ b/webht/third_party/vendorPlanSync/libraries/trippest.php
@@ -92,7 +92,11 @@ class Trippest
     public function if_tour_pvt($all_pag_info)
     {
         $tour_pvt_arr = array_filter(array_map(function($pag) {
-            if(intval($pag->PAG_ExtendType)===39009 && !in_array(intval($pag->PAG_Type), array(35003,35007)))
+            // 扩展类型:接送
+            // 包价类型: 非-[码头接送,大车游]
+            // 交通:非-[大车]
+            if(intval($pag->PAG_ExtendType)===39009 && !in_array(intval($pag->PAG_Type), array(35003,35007))
+                && !in_array(intval($pag->PAG_Vehicle), array(60002)))
             {
                 return 1;
             } else if (stripos($pag->PAG_Title,"PVT") !== false) {
diff --git a/webht/third_party/vendorPlanSync/models/Group_model.php b/webht/third_party/vendorPlanSync/models/Group_model.php
index 4983f015..41303b4e 100644
--- a/webht/third_party/vendorPlanSync/models/Group_model.php
+++ b/webht/third_party/vendorPlanSync/models/Group_model.php
@@ -78,6 +78,7 @@ class Group_model extends CI_Model {
                             $vgrd->PAG_Code = mb_strtoupper($vaci->PAG_Code);
                             $vgrd->PAG_ExtendType = mb_strtoupper($vaci->PAG_ExtendType);
                             $vgrd->PAG_Type = trim($vaci->PAG_Type);
+                            $vgrd->PAG_Vehicle = $vaci->PAG_Vehicle;
                             $vgrd->pag_code_arr[] = mb_strtoupper($vaci->PAG_Code);
                             break;
                         }
@@ -112,6 +113,7 @@ class Group_model extends CI_Model {
                             $vgrd->PAG_Code = mb_strtoupper($vcold->PAG_Code);
                             $vgrd->PAG_ExtendType = mb_strtoupper($vcold->PAG_ExtendType);
                             $vgrd->PAG_Type = trim($vcold->PAG_Type);
+                            $vgrd->PAG_Vehicle = $vcold->PAG_Vehicle;
                             $vgrd->pag_code_arr[] = mb_strtoupper($vcold->PAG_Code);
                             break;
                         }
@@ -151,6 +153,7 @@ class Group_model extends CI_Model {
                     isnull(pag_for_channel.PAG_ExtendType,pag_tp.PAG_ExtendType) as PAG_ExtendType,
                     isnull(pag_for_channel.PAG_Type,pag_tp.PAG_Type) as PAG_Type,
                     isnull(pag_for_channel.PAG_DEI_SN,pag_tp.PAG_DEI_SN) as PAG_DEI_SN,
+                    isnull(pag_for_channel.PAG_Vehicle,pag_tp.PAG_Vehicle) as PAG_Vehicle,
                     -- (select PAG_DEI_SN from BIZ_PackageInfo where PAG_SN=ACI_ServiceSN) as raw_PAG_DEI_SN,
                     aci.*
                 from ArrangeConfirmInfo aci
@@ -179,6 +182,7 @@ class Group_model extends CI_Model {
                     isnull(pag_for_channel.PAG_ExtendType,pag_tp.PAG_ExtendType) as PAG_ExtendType,
                     isnull(pag_for_channel.PAG_Type,pag_tp.PAG_Type) as PAG_Type,
                     isnull(pag_for_channel.PAG_DEI_SN,pag_tp.PAG_DEI_SN) as PAG_DEI_SN,
+                    isnull(pag_for_channel.PAG_Vehicle,pag_tp.PAG_Vehicle) as PAG_Vehicle,
                     -- (select PAG_DEI_SN from BIZ_PackageInfo where PAG_SN=COLD_ServiceSN) as raw_PAG_DEI_SN,
                     cold.* from BIZ_ConfirmLineDetail cold
                 left join [Tourmanager].[dbo].[BIZ_PackageInfoRelate] pl on pl.PAGR_PAG_SN_channel=COLD_ServiceSN