From bb62f862bbe0f386d224b1bfc58c00f172ea43a4 Mon Sep 17 00:00:00 2001 From: lyt Date: Sun, 18 Aug 2019 21:27:31 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=B8=A0=E9=81=93=E5=AE=9E?= =?UTF-8?q?=E6=94=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trippestOrderSync/models/orders_model.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/webht/third_party/trippestOrderSync/models/orders_model.php b/webht/third_party/trippestOrderSync/models/orders_model.php index e5753ad1..0190310c 100644 --- a/webht/third_party/trippestOrderSync/models/orders_model.php +++ b/webht/third_party/trippestOrderSync/models/orders_model.php @@ -180,8 +180,8 @@ class Orders_model extends CI_Model { public function get_groupCombineInfo_finance() { // return array(); // 历史数据已获取完毕 - $to_update_month_begin = date('Y-m-01', strtotime("-2 months", strtotime(date("Y-m-d")))); - $to_update_month_end = date('Y-m-01', strtotime("-1 months", strtotime(date("Y-m-d")))); + $to_update_month_begin = date('Y-m-01', strtotime("-4 months", strtotime(date("Y-m-d")))); + $to_update_month_end = date('Y-m-01', strtotime("-3 months", strtotime(date("Y-m-d")))); $end_d = strtotime($to_update_month_end)-1; $to_update_month_end = date("Y-m-d 23:59:59", $end_d); $set_time = date("Y-m-d 00:00:00", strtotime("+50 days",$end_d)); @@ -197,11 +197,11 @@ class Orders_model extends CI_Model { where GCI_combineNo is not null and GCI_combineNo not in ('cancel','forbidden') -- 已生成账单的不再自动同步 - and NOT exists ( - select 1 from report_order where ordernumber=COLI_ID and orderstats=1 - ) + -- and NOT exists ( + -- select 1 from report_order where ordernumber=COLI_ID and orderstats=1 + -- ) and GCI_travelDate between '$to_update_month_begin' and '$to_update_month_end' - and gci.GCI_createTime < '$set_time' + -- and gci.GCI_createTime < '$set_time' and GCI_combineNo not like '%取消%' "; $sql .= " ORDER BY isHistory ASC,GCI_createTime ASC ";