From 931c60c258426ea2d14b61507b2d811e9f3b54c5 Mon Sep 17 00:00:00 2001 From: lyt Date: Fri, 26 Jul 2019 15:35:38 +0800 Subject: [PATCH] =?UTF-8?q?Trippest=E5=90=8C=E6=AD=A5:=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E4=BF=A1=E6=81=AF=E8=8E=B7=E5=8F=96,?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A2=84=E5=AE=9A=E6=97=B6=E9=97=B4=E6=98=AF?= =?UTF-8?q?=E4=BB=8A=E5=A4=A9=E7=9A=84=E8=AE=A2=E5=8D=95.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- webht/third_party/trippestOrderSync/models/orders_model.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/webht/third_party/trippestOrderSync/models/orders_model.php b/webht/third_party/trippestOrderSync/models/orders_model.php index e7c09e08..3b20830f 100644 --- a/webht/third_party/trippestOrderSync/models/orders_model.php +++ b/webht/third_party/trippestOrderSync/models/orders_model.php @@ -148,7 +148,11 @@ class Orders_model extends CI_Model { $sql .= " and GCI_VendorOrderId='$get_vendorID' "; } if ($startDate !== NULL) { - $sql .= " and gci.GCI_travelDate between '$startDate' and '$endDate' + $sql .= " and ( + gci.GCI_travelDate between '$startDate' and '$endDate' + OR + CONVERT(DATE, COLI_ApplyDate) = CONVERT(DATE, GETDATE()) + ) and gci.GCI_createTime < '" . date($createTime_format) . "' "; } // 近期的订单同步完成之后, 同步历史数据