From 56dc17a5afd39e5de7aa4148777aacb55dd61d87 Mon Sep 17 00:00:00 2001 From: gazebo Date: Wed, 5 Feb 2020 16:09:18 +0800 Subject: [PATCH] =?UTF-8?q?GetStoreOrderAfterTime=E8=80=83=E8=99=91?= =?UTF-8?q?=E5=BE=85=E6=94=AF=E6=8C=81=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/model/dao/dao_order.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/business/model/dao/dao_order.go b/business/model/dao/dao_order.go index 6944301f9..cefbc43dd 100644 --- a/business/model/dao/dao_order.go +++ b/business/model/dao/dao_order.go @@ -183,7 +183,7 @@ func GetStoreOrderAfterTime(db *DaoDB, storeID int, orderTime time.Time, lastOrd t2.actual_fee, t2.desired_fee, t2.waybill_created_at, t2.waybill_finished_at FROM goods_order t1 LEFT JOIN waybill t2 ON t1.vendor_waybill_id = t2.vendor_waybill_id AND t1.waybill_vendor_id = t2.waybill_vendor_id - WHERE IF(t1.jx_store_id <> 0, t1.jx_store_id, t1.store_id) = ? AND t1.order_created_at >= ? AND t1.id > ? AND t1.status < ? + WHERE IF(t1.jx_store_id <> 0, t1.jx_store_id, t1.store_id) = ? AND t1.order_created_at >= ? AND t1.id > ? AND t1.status >= ? AND t1.status < ? AND (t1.flag & ?) = 0 ORDER BY t1.order_created_at DESC, t1.id DESC; ` @@ -191,6 +191,7 @@ func GetStoreOrderAfterTime(db *DaoDB, storeID int, orderTime time.Time, lastOrd storeID, orderTime, lastOrderSeqID, + model.OrderStatusNew, model.OrderStatusEndBegin, model.OrderFlagMaskFake, }