diff --git a/webht/third_party/vendorPlanSync/libraries/Tulanduo.php b/webht/third_party/vendorPlanSync/libraries/Tulanduo.php index 113cd0e1..595c65db 100644 --- a/webht/third_party/vendorPlanSync/libraries/Tulanduo.php +++ b/webht/third_party/vendorPlanSync/libraries/Tulanduo.php @@ -365,6 +365,9 @@ class Tulanduo if (intval($pag->PAG_DEI_SN)===1 && ! empty($pag->PAG_Code)) { $pag->PAG_Code = $this->ci->trippest->ch_code_transfer( mb_strtoupper($pag->PAG_Code)); $pag->PAG_ExtendType = $this->tulanduo_trippest_pag[$pag->PAG_Code]->PAG_ExtendType; + } else if (false !== stripos($pag->GRD_Landscape, 'trippest')) { + $apart["com"]['details'][$pag->PAG_Code][] = $pag; + continue; } if (empty($pag->PAG_Code)) // 已在grd查询中增加是否目的地产品的判断 { @@ -395,6 +398,9 @@ class Tulanduo if ($vi !== $vp) { unset($apart_com[$vi]); } + if (empty($apart_com[$vp]['details'])) { + $apart_com[$vp]['details'] = array(); + } // $apart_com[$vp]['details'][] = $apart['com']['details'][$vi]; $apart_com[$vp]['details'] = array_merge($apart_com[$vp]['details'], $apart['com']['details'][$vi]); $apart_com[$vp]['PAG_Code'] = $vp; diff --git a/webht/third_party/vendorPlanSync/models/Group_model.php b/webht/third_party/vendorPlanSync/models/Group_model.php index 62ab259f..5dfecc4d 100644 --- a/webht/third_party/vendorPlanSync/models/Group_model.php +++ b/webht/third_party/vendorPlanSync/models/Group_model.php @@ -149,7 +149,7 @@ class Group_model extends CI_Model { * from ArrangeConfirmInfo aci left join BIZ_PackageInfo on PAG_SN=ACI_ServiceSN - and ACI_ServiceType='D' and PAG_DefaultVEI_SN=ACI_VEI_SN + and ACI_ServiceType='D' --and PAG_DefaultVEI_SN=ACI_VEI_SN -- 增加是否目的地产品的判断 and SUBSTRING(CONVERT(varchar(10), PAG_SourceType) ,1,3)='132' where 1=1