From d712319653d4bf6de89c33cdac27479b9d881298 Mon Sep 17 00:00:00 2001 From: lyt Date: Thu, 2 Jan 2020 09:33:17 +0800 Subject: [PATCH 1/5] fix: report tour: tourProvider --- .../trippestOrderSync/controllers/order_finance.php | 8 +++++--- .../trippestOrderSync/models/orderFinance_model.php | 2 +- .../trippestOrderSync/models/vendor_money_model.php | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/webht/third_party/trippestOrderSync/controllers/order_finance.php b/webht/third_party/trippestOrderSync/controllers/order_finance.php index 961e6585..bef65b10 100644 --- a/webht/third_party/trippestOrderSync/controllers/order_finance.php +++ b/webht/third_party/trippestOrderSync/controllers/order_finance.php @@ -433,8 +433,9 @@ class Order_finance extends CI_Controller { } } $this_order_real_pag_sns = array_map(function($ele) {return $ele->real_pag_sn;}, $ret->order_cost); - $pags_info = $this->OrderFinance_model->get_pag_info(implode(',', array_unique(array_filter($this_order_real_pag_sns)))); // $pag_sns - $ret->vendor_name = implode(",", array_values(array_unique(array_map(function($ele) {return $ele->VEI2_CompanyBN;}, $pags_info)))) ; + $pags_info = $this->OrderFinance_model->get_pag_info(implode(',', array_unique(array_filter($this_order_real_pag_sns))),$ret->order_cost[0]->vei_sn); // $pag_sns + $ret->vendor_name = implode(",", array_values(array_unique(array_filter( array_map(function($ele) {return $ele->VEI2_CompanyBN;}, $pags_info))))) ; + // $ret->vendor_name = trim($ret->vendor_name); $ret->pag_name = implode("; ", array_map(function($ele) {return $ele->PAG_Title;}, $pags_info)) ; $ret->PAG_Code = implode(",", $ret->combine_pags); $ret->comment = "拼团" . $combineNo . ", 按" . $ret->person_num . "人等"; @@ -504,7 +505,7 @@ class Order_finance extends CI_Controller { $pag_sns = array_values(array_unique(array_map(function($ele) {return $ele->COLD_ServiceSN;}, $all_orders))); $pags_info = $this->OrderFinance_model->get_pag_info(implode(',', $pag_sns), $all_orders[0]->COLD_PlanVEI_SN); $ret->PAG_Code = implode(",", array_values(array_unique(array_map(function($ele) {return mb_strtoupper($ele->PAG_Code);}, $pags_info)))); - $ret->vendor_name = implode(",", array_values(array_unique(array_map(function($ele) {return $ele->VEI2_CompanyBN;}, $pags_info)))) ; + $ret->vendor_name = implode(",", array_values(array_unique(array_filter(array_map(function($ele) {return $ele->VEI2_CompanyBN;}, $pags_info))))) ; $ret->pag_name = implode("; ", array_map(function($ele) {return $ele->PAG_Title;}, $pags_info)) ; if ($debug!=false) { return $this->output->set_content_type('application/json')->set_output(json_encode($ret)); @@ -564,6 +565,7 @@ class Order_finance extends CI_Controller { "BJALC-209", // "BJSIC-16", "SHSIC-45", + "SHSIC-57", "XASIC-16" ); } diff --git a/webht/third_party/trippestOrderSync/models/orderFinance_model.php b/webht/third_party/trippestOrderSync/models/orderFinance_model.php index 3def163e..11bec1f8 100644 --- a/webht/third_party/trippestOrderSync/models/orderFinance_model.php +++ b/webht/third_party/trippestOrderSync/models/orderFinance_model.php @@ -188,7 +188,7 @@ class OrderFinance_model extends CI_Model { if ($PAG_SN_str=="") { return array(); } - $vei_sql = $cold_vei===null ? 'PAG_DefaultVEI_SN' : "isnull(PAG_DefaultVEI_SN,$cold_vei)"; + $vei_sql = $cold_vei===null ? 'PAG_DefaultVEI_SN' : $cold_vei; $sql = "SELECT pag.PAG_SN,PAG_Code,PAG_DefaultVEI_SN,PAG_Title,vei2.VEI2_CompanyBN from BIZ_PackageInfo pag left join VEndorInfo2 vei2 on VEI2_VEI_SN=$vei_sql and VEI2_LGC=2 diff --git a/webht/third_party/trippestOrderSync/models/vendor_money_model.php b/webht/third_party/trippestOrderSync/models/vendor_money_model.php index 00d33cfd..9ab886f4 100644 --- a/webht/third_party/trippestOrderSync/models/vendor_money_model.php +++ b/webht/third_party/trippestOrderSync/models/vendor_money_model.php @@ -385,7 +385,7 @@ class Vendor_money_model extends CI_Model { public function get_precheck_price_error($start_date, $end_date, $all_vendor) { - $expire_fresh = date('Y-m-d',strtotime("+2 months", strtotime($start_date))); + $expire_fresh = date('Y-m-d',strtotime("+62 days", strtotime($start_date))); $sql = "SELECT data_tmp.TLD_total_price-(HT_haina_receipt+HT_agency_receipt) as 'total_price_err', --总团款差额 (账单减HT)', case data_tmp.COLI_OPI_ID when 435 From 80a397afcb21826270168558f8247994b80f73c3 Mon Sep 17 00:00:00 2001 From: lyt Date: Tue, 7 Jan 2020 13:40:14 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix:=20Trippest=20=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=9A=84=E7=8A=B6=E6=80=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trippestOrderSync/controllers/TulanduoApi.php | 12 ++++++++++++ .../trippestOrderSync/models/orders_model.php | 3 ++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php b/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php index 66811b34..b9df1c80 100644 --- a/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php +++ b/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php @@ -327,6 +327,18 @@ class TulanduoApi extends CI_Controller $getInfo_byGroupCode = $getInfo_byGroupCodeArr[0]; // 渠道和目的地有重复操作的团 $duplicate = true; } else { + $null_gci = array_map(function ($ele) { + if (intval($ele->COLI_OPI_ID)===435 && $ele->senderIP==='' + && $ele->gci===null + ) { + return $ele->COLI_ID; + } else { + return null; + } + }, $getInfo_byGroupCodeArr); + foreach (array_unique(array_filter($null_gci)) as $knull => $vnull) { + $this->order_cancel($vnull); + } foreach ($getInfo_byGroupCodeArr as $kg => $vg) { // 同步的订单, 修改了团号, 用地接社id匹配 if(intval($order->COLI_OPI_ID)===435 && $order->GCI_VendorOrderId == $vg->gci) { diff --git a/webht/third_party/trippestOrderSync/models/orders_model.php b/webht/third_party/trippestOrderSync/models/orders_model.php index 270d6f97..3deaaabe 100644 --- a/webht/third_party/trippestOrderSync/models/orders_model.php +++ b/webht/third_party/trippestOrderSync/models/orders_model.php @@ -593,12 +593,13 @@ class Orders_model extends CI_Model { */ public function get_order_by_groupcode($code, $order_id=0, $vei_sn=0) { - $vei_sn_sql = $vei_sn===0 ? " " : " AND COLD_PlanVEI_SN=$vei_sn "; + $vei_sn_sql = $vei_sn===0 ? " " : " AND isnull(COLD_PlanVEI_SN,1343) in (1343,$vei_sn) "; $sql = "SELECT COLI_SN,gri.GRI_SN,cold.COLD_PlanVEI_SN,cold.COLD_SN,coli.COLI_ID, (select top 1 case gci_vendororderId when $order_id then gci_vendororderId else 0 end from groupcombineinfo where gci_gri_sn=coli_gri_sn order by case gci_vendororderId when $order_id then 0 else 1 end asc ) as gci, + ISNULL(coli.COLI_SenderIP,'') senderIP, coli.COLI_OrderDetailText,coli.COLI_GroupCode,coli.COLI_GRI_SN, coli.COLI_State,coli.COLI_OPI_ID,coli.COLI_Price,coli.COLI_CUrrency GRI_OPI_ID,GRI_operator,GRI_No,GRI_Name, From 12ade0e9b9f6e54a1d4492c0a0e09f964a5b79bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B9=E8=AF=9A=E8=AF=9A?= Date: Tue, 7 Jan 2020 15:06:39 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=82=AE=E7=AE=B1?= =?UTF-8?q?=E5=8F=91=E9=80=81=E7=AB=AF=E5=8F=A3=EF=BC=8C=E8=A7=A3=E5=86=B3?= =?UTF-8?q?=E9=82=AE=E4=BB=B6=E5=8F=91=E9=80=81=E5=A4=B1=E8=B4=A5=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/sendmail.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/controllers/sendmail.php b/application/controllers/sendmail.php index 7235133f..f0656bf8 100644 --- a/application/controllers/sendmail.php +++ b/application/controllers/sendmail.php @@ -54,8 +54,8 @@ class Sendmail extends CI_Controller } $this->load->library('email'); $config['protocol'] = 'smtp'; - $config['smtp_host'] = 'ssl://hwsmtp.exmail.qq.com';//ssl://smtp.sendgrid.net'; - $config['smtp_port'] = 465; + $config['smtp_host'] = 'hwsmtp.exmail.qq.com';//ssl://smtp.sendgrid.net'; + $config['smtp_port'] = 25; $config['smtp_user'] = 'noreply02@chinahighlights.net';//'zm198311@yahoo.com.cn'; $config['smtp_pass'] = 'eHgb2Z8G\HbR';//cits@123'; $config['smtp_timeout'] = 3600; From 215575ad5955fc397b4e4d1887117d275be6320c Mon Sep 17 00:00:00 2001 From: lyt Date: Tue, 7 Jan 2020 15:11:42 +0800 Subject: [PATCH 4/5] =?UTF-8?q?feat:=20=E9=A2=84=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9B=B4=E6=96=B0=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controllers/vendor_money.php | 17 +++++++++++++++++ .../models/vendor_money_model.php | 6 +++--- .../views/order_report_precheck.php | 2 +- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/webht/third_party/trippestOrderSync/controllers/vendor_money.php b/webht/third_party/trippestOrderSync/controllers/vendor_money.php index b22c3401..c3ef370a 100644 --- a/webht/third_party/trippestOrderSync/controllers/vendor_money.php +++ b/webht/third_party/trippestOrderSync/controllers/vendor_money.php @@ -298,6 +298,12 @@ class Vendor_money extends CI_Controller { $vendor_sourcetype = $this->trippest->vendor_sourcetype(); // price [Trippest receipts & agency receipts] $ret['price_error'] = $this->money_model->get_precheck_price_error($start_date, $end_date, implode(',' ,$vendors)); + // 仅更新成本数据, 后重新获取 + $to_update = array_values(array_unique(array_filter(array_column($ret['price_error'], 'vendor_order')))); + if ( ! empty($to_update)) { + $this->async_fresh_operation($to_update); + $ret['price_error'] = $this->money_model->get_precheck_price_error($start_date, $end_date, implode(',' ,$vendors)); + } // not found in GroupCombineInfo $ret['not_found'] = $this->money_model->get_order_not_found_gci($start_date, $end_date, implode(',' ,$vendors)); // cost @@ -358,6 +364,17 @@ class Vendor_money extends CI_Controller { return false; } + private function async_fresh_operation($gci_ids) + { + foreach ($gci_ids as $key => $vendor_orderid) { + if ($key > 10) { + break; + } + async_curl("http://www.mycht.cn/webht.php/apps/trippestOrderSync/TulanduoApi/insert_HT_order_operation/0/" . $vendor_orderid, 2); + } + return false; + } + private function diff_xls_ht_cost($xls_data, $HT_combine_cost) { $cost_error = array(); diff --git a/webht/third_party/trippestOrderSync/models/vendor_money_model.php b/webht/third_party/trippestOrderSync/models/vendor_money_model.php index 9ab886f4..b80a3607 100644 --- a/webht/third_party/trippestOrderSync/models/vendor_money_model.php +++ b/webht/third_party/trippestOrderSync/models/vendor_money_model.php @@ -385,7 +385,7 @@ class Vendor_money_model extends CI_Model { public function get_precheck_price_error($start_date, $end_date, $all_vendor) { - $expire_fresh = date('Y-m-d',strtotime("+62 days", strtotime($start_date))); + $expire_fresh = date('Y-m-d',strtotime("+2 months", strtotime($start_date))); $sql = "SELECT data_tmp.TLD_total_price-(HT_haina_receipt+HT_agency_receipt) as 'total_price_err', --总团款差额 (账单减HT)', case data_tmp.COLI_OPI_ID when 435 @@ -399,7 +399,7 @@ class Vendor_money_model extends CI_Model { ,data_tmp.total_income-(round(HT_haina_receipt,1)+ ROUND(HT_agency_receipt,1)) as 'total_income_err' --'海纳收入差额' ,(select top 1 GCI_combineNo from groupcombineinfo where gci_gri_sn=data_tmp.GRI_SN) as combineNo ,(select top 1 GCI_VendorOrderId from groupcombineinfo - where gci_gri_sn=data_tmp.GRI_SN and ( GCI_createTime<'$expire_fresh' or GCI_combineNo is null) + where gci_gri_sn=data_tmp.GRI_SN and ( GCI_createTime<'$expire_fresh' ) ) as vendor_order ,* from ( @@ -410,7 +410,7 @@ class Vendor_money_model extends CI_Model { and COLD_COLI_SN=coli.COLI_SN ) as other_price, (select isnull(SUM(cast(GCI_priceCNY as decimal(10,2))),0) from GroupCombineInfo where GCI_GRI_SN=COLI_GRI_SN and GCI_combineNo<>'cancel' ) as TLD_total_price, - (select isnull(SUM(cast(GCI_agencyReceipt as decimal(10,2))),0) from GroupCombineInfo where GCI_GRI_SN=COLI_GRI_SN) as TLD_agency_receipt, + (select isnull(SUM(cast(GCI_agencyReceipt as decimal(10,2))),0) from GroupCombineInfo where GCI_GRI_SN=COLI_GRI_SN and GCI_combineNo is not null ) as TLD_agency_receipt, (select isnull(SUM(cast(GAI_SSJE as decimal(10,2))),0) from BIZ_GroupAccountInfo where GAI_COLI_SN=COLI_SN and GAI_Type in (" . PAY_OTHER . ") AND GAI_VEI_SN in ($all_vendor,1343) -- 图兰朵的代收 diff --git a/webht/third_party/trippestOrderSync/views/order_report_precheck.php b/webht/third_party/trippestOrderSync/views/order_report_precheck.php index f32c2eda..0318037a 100644 --- a/webht/third_party/trippestOrderSync/views/order_report_precheck.php +++ b/webht/third_party/trippestOrderSync/views/order_report_precheck.php @@ -272,7 +272,7 @@ } elseif ($ep['other_price'] !== NULL) { echo "

其他供应商接待的报价/美金:" . $ep['other_price'] . "

"; } elseif ($ep['vendor_order'] !== null) { - echo "

数据未更新, 请到HT中操作.

"; + // echo "

数据未更新, 请到HT中操作.

"; } ?> From d6b07cd425ea19665d952b4c32cfc9a6140da52f Mon Sep 17 00:00:00 2001 From: lyt Date: Tue, 7 Jan 2020 15:51:04 +0800 Subject: [PATCH 5/5] =?UTF-8?q?feat:=20Trippest=E6=94=AF=E6=8C=81=E9=85=92?= =?UTF-8?q?=E5=BA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../third_party/trippestOrderSync/models/orderFinance_model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webht/third_party/trippestOrderSync/models/orderFinance_model.php b/webht/third_party/trippestOrderSync/models/orderFinance_model.php index 11bec1f8..0f0e9c88 100644 --- a/webht/third_party/trippestOrderSync/models/orderFinance_model.php +++ b/webht/third_party/trippestOrderSync/models/orderFinance_model.php @@ -361,7 +361,7 @@ class OrderFinance_model extends CI_Model { left(convert(varchar,COLD_EndDate,120),10) AS endtime, COLD_Count roomnumber, isnull(HOI_ExtraNum,0) AS ExtraBedNumber, - COLD_DayCount=DATEDIFF(DAY,COLD_StartDate,COLD_EndDate) as jianyeshu, + DATEDIFF(DAY,COLD_StartDate,COLD_EndDate) as jianyeshu, COLD_TotalCost*1.0/dbo.ZeroToOne(DATEDIFF(DAY,COLD_StartDate,COLD_EndDate)) as jianyecost, 0 as ExtraBedCost, 0 as ExtraBedPrice,