From c42919aeaad6d044c123fb3a2cd8dce7752ad3d1 Mon Sep 17 00:00:00 2001 From: lyt Date: Tue, 16 Jul 2019 16:23:01 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=9C=B0=E6=8E=A5=E8=AE=A1=E5=88=92:?= =?UTF-8?q?=E9=A2=84=E5=AE=9A=E9=A1=B9=E7=9B=AE=E4=BD=BF=E7=94=A8=E4=BA=A7?= =?UTF-8?q?=E5=93=81=E5=85=B3=E8=81=94=E6=9F=A5=E6=89=BETrippest=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E7=BB=84=E7=9A=84=E4=BA=A7=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vendorPlanSync/libraries/Tulanduo.php | 14 +++---- .../models/BIZ_orders_model.php | 3 -- .../vendorPlanSync/models/Group_model.php | 39 ++++++++++++------- 3 files changed, 33 insertions(+), 23 deletions(-) diff --git a/webht/third_party/vendorPlanSync/libraries/Tulanduo.php b/webht/third_party/vendorPlanSync/libraries/Tulanduo.php index 595c65db..17986239 100644 --- a/webht/third_party/vendorPlanSync/libraries/Tulanduo.php +++ b/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; diff --git a/webht/third_party/vendorPlanSync/models/BIZ_orders_model.php b/webht/third_party/vendorPlanSync/models/BIZ_orders_model.php index e6982ad7..9b0068c3 100644 --- a/webht/third_party/vendorPlanSync/models/BIZ_orders_model.php +++ b/webht/third_party/vendorPlanSync/models/BIZ_orders_model.php @@ -128,7 +128,6 @@ class BIZ_Orders_model extends CI_Model { AND ISNULL(bgai.GAI_VEI_SN,0) in (0,$vei_sn_str) AND bgai.GAI_SQJE > 0 AND coli_ID = '$COLI_ID'"; -log_message('error',$sql); $query = $this->HT->query($sql); return $query->result(); } @@ -297,8 +296,6 @@ log_message('error',$sql); ,"BOL_Creator" => 29 ,"BOL_CreateTime" => date('Y-m-d H:i:s') ); -return log_message('error',$this->HT->insert_string("BIZ_OrderOperationLog", $db_column)); -return ; return $this->HT->insert("BIZ_OrderOperationLog", $db_column); } diff --git a/webht/third_party/vendorPlanSync/models/Group_model.php b/webht/third_party/vendorPlanSync/models/Group_model.php index 76fad00b..e4dd44bf 100644 --- a/webht/third_party/vendorPlanSync/models/Group_model.php +++ b/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 From 9fd7cbc86c27032d204af1976df35f754c1127fb Mon Sep 17 00:00:00 2001 From: lyt Date: Mon, 22 Jul 2019 10:08:06 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=9C=B0=E6=8E=A5=E8=AE=A1=E5=88=92:=20?= =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=95=86=E5=8A=A1=E8=AE=A2=E5=8D=95=E7=9A=84?= =?UTF-8?q?PVT=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- webht/third_party/vendorPlanSync/libraries/Tulanduo.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/webht/third_party/vendorPlanSync/libraries/Tulanduo.php b/webht/third_party/vendorPlanSync/libraries/Tulanduo.php index 17986239..494a9460 100644 --- a/webht/third_party/vendorPlanSync/libraries/Tulanduo.php +++ b/webht/third_party/vendorPlanSync/libraries/Tulanduo.php @@ -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;