From 45958aa27114364b14d859f5deafc3bde1023038 Mon Sep 17 00:00:00 2001
From: lyt <lyt@hainatravel.com>
Date: Mon, 9 Dec 2019 14:51:28 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E9=A2=84=E5=AE=A1=E6=A0=B8=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trippestOrderSync/models/vendor_money_model.php         | 6 +++++-
 .../trippestOrderSync/views/order_report_precheck.php       | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/webht/third_party/trippestOrderSync/models/vendor_money_model.php b/webht/third_party/trippestOrderSync/models/vendor_money_model.php
index 84cae67e..6334613b 100644
--- a/webht/third_party/trippestOrderSync/models/vendor_money_model.php
+++ b/webht/third_party/trippestOrderSync/models/vendor_money_model.php
@@ -385,6 +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)));
         $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
@@ -398,13 +399,16 @@ 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<'2019-10-01' or GCI_combineNo is null)
+                    where gci_gri_sn=data_tmp.GRI_SN and ( GCI_createTime<'$expire_fresh' or GCI_combineNo is null)
                 ) as vendor_order
                 ,* from
                 (
                 select
                 gri.GRI_Name,
                 ro.money total_income,
+                (select SUM(COLD_TotalPrice) from BIZ_ConfirmLineDetail d where d.DeleteFlag=0 and d.COLD_PlanVEI_SN not in ($all_vendor)
+                    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(GAI_SSJE as decimal(10,2))),0) from BIZ_GroupAccountInfo where GAI_COLI_SN=COLI_SN
diff --git a/webht/third_party/trippestOrderSync/views/order_report_precheck.php b/webht/third_party/trippestOrderSync/views/order_report_precheck.php
index edb58ff9..f32c2eda 100644
--- a/webht/third_party/trippestOrderSync/views/order_report_precheck.php
+++ b/webht/third_party/trippestOrderSync/views/order_report_precheck.php
@@ -269,6 +269,8 @@
                                     echo "<p>HT未更新退款: " . $ep['HT_receipt_err'] . "</p>";
                                 } elseif ($ep['HT_receipt_err'] > 0) {
                                     echo "<p class=\"text-left\">" . $ep["refund_memo"] . "</p>";
+                                } elseif ($ep['other_price'] !== NULL) {
+                                    echo "<p>其他供应商接待的报价/美金:" . $ep['other_price'] . "</p>";
                                 } elseif ($ep['vendor_order'] !== null) {
                                     echo "<p>数据未更新, 请到HT中操作.</p>";
                                 }