liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GetStoreOrderAfterTime考虑待支持订单

Browse Source
This commit is contained in:
gazebo
2020-02-05 16:09:18 +08:00
parent dbcfd0be91
commit 56dc17a5af
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
business/model/dao/dao_order.go
View File

@@ -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 t2.actual_fee, t2.desired_fee, t2.waybill_created_at, t2.waybill_finished_at
FROM goods_order t1 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 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 AND (t1.flag & ?) = 0
ORDER BY t1.order_created_at DESC, t1.id DESC; 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, storeID,
orderTime, orderTime,
lastOrderSeqID, lastOrderSeqID,
model.OrderStatusNew,
model.OrderStatusEndBegin, model.OrderStatusEndBegin,
model.OrderFlagMaskFake, model.OrderFlagMaskFake,
} }