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

webht/third_party/vendorPlanSync/libraries/Tulanduo.php

@@ -362,13 +362,13 @@ class Tulanduo
                 continue;
             }
             // CH下的产品编号修正
-            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 (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查询中增加是否目的地产品的判断
             {
                 $apart['big_pvt']['details'][] = $pag;
@@ -378,7 +378,8 @@ class Tulanduo
                 $pag->PAG_Title = $this->tulanduo_trippest_pag[$pag->PAG_Code]->PAG_Title;
             }
             // 合作的产品
-            if ($this->ci->trippest->if_tour_pvt(array($pag))===1 || isset($pag->is_biz)) {
+            // 商务订单全部按PVT || isset($pag->is_biz)
+            if ($this->ci->trippest->if_tour_pvt(array($pag))===1) {
                 $apart["pvt"]['details'][] = $pag;
             } else {
                 $apart["com"]['details'][$pag->PAG_Code][] = $pag;

webht/third_party/vendorPlanSync/models/Group_model.php

@@ -147,13 +147,19 @@ class Group_model extends CI_Model {
                         where CII2_CII_SN=ACI_ToCity and CII2_LGC=2) as tocity,
                     (select CII_PKCode from CItyInfo
                         where CII_SN=ACI_ToCity ) as citycode,
-                    PAG_Code,PAG_ExtendType,PAG_DEI_SN,
-                    *
+                    isnull(pag_for_channel.PAG_Code,pag_tp.PAG_Code) as PAG_Code,
+                    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,
+                    -- (select PAG_DEI_SN from BIZ_PackageInfo where PAG_SN=ACI_ServiceSN) as raw_PAG_DEI_SN,
+                    aci.*
                 from ArrangeConfirmInfo aci
-                left join BIZ_PackageInfo on PAG_SN=ACI_ServiceSN
-                    and ACI_ServiceType='D' --and PAG_DefaultVEI_SN=ACI_VEI_SN
-                    -- 增加是否目的地产品的判断
-                    and SUBSTRING(CONVERT(varchar(10), PAG_SourceType) ,1,3)='132'
+                left join [Tourmanager].[dbo].[BIZ_PackageInfoRelate] pl on pl.PAGR_PAG_SN_channel=ACI_ServiceSN
+                    and isnull(pl.PAGR_DeleteFlag,0) = 0
+                left join BIZ_PackageInfo pag_for_channel on pag_for_channel.PAG_SN=pl.PAGR_PAG_SN_host
+                    and pag_for_channel.PAG_DEI_SN=30
+                left join BIZ_PackageInfo pag_tp on pag_tp.PAG_SN=ACI_ServiceSN
+                    and pag_tp.PAG_DEI_SN=30
                 where 1=1
                     and aci.ACI_GRI_SN=?
                     $vendor_sql
@@ -166,14 +172,21 @@ class Group_model extends CI_Model {
     {
         $sql = "SELECT
                     (select CII2_Name from CItyInfo2
-                        where CII2_CII_SN=PAG_CII_SN and CII2_LGC=2) as tocity,
+                        where CII2_CII_SN=isnull(pag_for_channel.PAG_CII_SN,pag_tp.PAG_CII_SN) and CII2_LGC=2) as tocity,
                     (select CII_PKCode from CItyInfo
-                        where CII_SN=PAG_CII_SN ) as citycode,
-                    PAG_Code,PAG_ExtendType,PAG_DEI_SN,
-                * from BIZ_ConfirmLineDetail cold
-                left join BIZ_PackageInfo on PAG_SN=COLD_ServiceSN
-                    and COLD_ServiceType='D' and PAG_DefaultVEI_SN=COLD_PlanVEI_SN
-                    and SUBSTRING(CONVERT(varchar(10), PAG_SourceType) ,1,3)='132'
+                        where CII_SN=isnull(pag_for_channel.PAG_CII_SN,pag_tp.PAG_CII_SN) ) as citycode,
+                    isnull(pag_for_channel.PAG_Code,pag_tp.PAG_Code) as PAG_Code,
+                    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,
+                    -- (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
+                    and isnull(pl.PAGR_DeleteFlag,0) = 0
+                left join BIZ_PackageInfo pag_for_channel on pag_for_channel.PAG_SN=pl.PAGR_PAG_SN_host
+                    and pag_for_channel.PAG_DEI_SN=30
+                left join BIZ_PackageInfo pag_tp on pag_tp.PAG_SN=COLD_ServiceSN
+                    and pag_tp.PAG_DEI_SN=30
                 where 1=1
                 and COLD_SN in (
                     $cold_sn_str