From d712319653d4bf6de89c33cdac27479b9d881298 Mon Sep 17 00:00:00 2001
From: lyt <lyt@hainatravel.com>
Date: Thu, 2 Jan 2020 09:33:17 +0800
Subject: [PATCH] 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