From f2f81d8ffaf5bb5432760084edddc018534be4db Mon Sep 17 00:00:00 2001
From: lyt <lyt@hainatravel.com>
Date: Wed, 5 Jun 2019 16:12:45 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E4=B8=8D=E6=8C=87=E5=AE=9A=E4=BE=9B=E5=BA=94=E5=95=86id;?=
 =?UTF-8?q?=E5=8E=9F=E5=9B=A0:=E5=8F=91=E9=80=81=E5=88=B0=E5=9B=BE?=
 =?UTF-8?q?=E5=85=B0=E6=9C=B5=E7=9A=84=E8=AE=A1=E5=88=92,=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E6=97=B6=E6=93=8D=E4=BD=9C=E9=83=A8=E9=97=A8=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E6=AD=A3=E7=A1=AE=E8=AE=BE=E7=BD=AE,=E4=BC=9A?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E9=87=8D=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 webht/third_party/trippestOrderSync/models/orders_model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webht/third_party/trippestOrderSync/models/orders_model.php b/webht/third_party/trippestOrderSync/models/orders_model.php
index 8e490339..7a31a671 100644
--- a/webht/third_party/trippestOrderSync/models/orders_model.php
+++ b/webht/third_party/trippestOrderSync/models/orders_model.php
@@ -544,7 +544,7 @@ class Orders_model extends CI_Model {
         $sql = "SELECT TOP 1 coli.COLI_GRI_SN,coli.COLI_SN,gci.GCI_SN
                 FROM GroupCombineInfo gci
                 INNER JOIN BIZ_ConfirmLineInfo coli ON coli.COLI_GRI_SN=gci.GCI_GRI_SN
-                WHERE gci.GCI_VendorOrderId='$vendorOrderId' and GCI_VEI_SN='$vendorID'";
+                WHERE gci.GCI_VendorOrderId='$vendorOrderId' "; // and GCI_VEI_SN='$vendorID'
         $query = $this->HT->query($sql);
         if ($query->row()) {
             $this->BIZ_COLI_SN = $query->row()->COLI_SN;

From 070869a62075000e2a43e4dbb36308f125a7ba57 Mon Sep 17 00:00:00 2001
From: lyt <lyt@hainatravel.com>
Date: Wed, 5 Jun 2019 16:30:52 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E8=B5=B0=E5=9B=A2?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F=E7=9A=84=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?,=E4=BE=9B=E5=BA=94=E5=95=86=E5=B9=B3=E5=8F=B0=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E6=98=AF=E4=B8=8D=E5=8B=BE=E9=80=89=E8=B5=B0=E5=9B=A2?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 webht/third_party/vendorPlanSync/models/Group_model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webht/third_party/vendorPlanSync/models/Group_model.php b/webht/third_party/vendorPlanSync/models/Group_model.php
index 522e50ec..83a46092 100644
--- a/webht/third_party/vendorPlanSync/models/Group_model.php
+++ b/webht/third_party/vendorPlanSync/models/Group_model.php
@@ -24,7 +24,7 @@ class Group_model extends CI_Model {
         $sql .= $gri_sn!==0 ? $gri_sql : "
                     AND isnull(VAS_IsCancel,0)=0 AND isnull(VAS_Delete,0)=0 AND isnull(vas.DeleteFlag,0)=0
                     AND VAS_IsSendSucceed=1 AND isnull(VAS_IsReceive,0)=0
-                    AND EOI_GetDate between '$start_date' AND '$end_date'
+                    -- AND EOI_GetDate between '$start_date' AND '$end_date'
                     -- Trippest, not confirm, not change -- for Trippest deploy
                     AND isnull(VAS_IsConfirm,0)=0 AND isnull(VAS_SendVary,0)=0
                     AND GRI_OrderType=227002