From e6328f5bc7cc7accb027e2fdc75644b18c9fa88c Mon Sep 17 00:00:00 2001
From: lyt <lyt@hainatravel.com>
Date: Thu, 29 Aug 2019 17:16:35 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B4=A6=E5=8D=95=E9=A2=84=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8:=E5=8F=96=E8=AE=A2=E5=8D=95=E5=AD=90=E8=A1=A8?=
 =?UTF-8?q?=E7=9A=84=E8=B5=B0=E5=9B=A2=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../models/vendor_money_model.php             | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/webht/third_party/trippestOrderSync/models/vendor_money_model.php b/webht/third_party/trippestOrderSync/models/vendor_money_model.php
index b4a901d4..ecd06ac2 100644
--- a/webht/third_party/trippestOrderSync/models/vendor_money_model.php
+++ b/webht/third_party/trippestOrderSync/models/vendor_money_model.php
@@ -335,17 +335,23 @@ class Vendor_money_model extends CI_Model {
                     AND gcod.GCOD_operationType<> 'otherReceives'
                     ) AS cost
                 FROM
-                (SELECT DISTINCT isnull(gci.GCI_combineNo,'1') GCI_combineNo,
+                (SELECT DISTINCT isnull(gci.GCI_combineNo,'?') GCI_combineNo,
                 GCI_VEI_SN
                 FROM GroupCombineInfo gci
                 WHERE 1=1
                     AND GCI_VEI_SN IN ($all_vendor)
-                    AND EXISTS
-                    ( SELECT 1
-                        FROM CK_GroupInfo
-                        WHERE CGI_Checked=1
-                        AND CGI_GRI_SN=GCI_GRI_SN
-                        AND CGI_ArriveDate BETWEEN '$start_date' AND '$end_date')
+                    -- AND EXISTS
+                    -- ( SELECT 1
+                    --     FROM CK_GroupInfo
+                    --     WHERE CGI_Checked=1
+                    --     AND CGI_GRI_SN=GCI_GRI_SN
+                    --     AND CGI_ArriveDate BETWEEN '$start_date' AND '$end_date')
+                    and exists (
+                        select 1 from BIZ_ConfirmLineInfo
+                        inner join BIZ_ConfirmLineDetail on COLI_SN=COLD_COLI_SN
+                        where COLI_GRI_SN=GCI_GRI_SN
+                        and COLD_StartDate BETWEEN '$start_date' AND '$end_date'
+                    )
                 ) AS group_cost
                 order by GCI_combineNo desc";
         $query = $this->HT->query($sql);