Merge branch 'feature/trippest'

6 years ago · cddb7b27fa
parent 6842aa2a1d 931c60c258
commit cddb7b27fa
1 changed files with 5 additions and 1 deletions
--- 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) . "' ";
        }
        // 近期的订单同步完成之后, 同步历史数据