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

Merge remote-tracking branch 'origin/mark' into su

Browse Source
This commit is contained in:
suyl
2020-02-07 14:21:22 +08:00
parent 9d203c90e7 fbdd8849f6
commit 9afb6adfbb
4 changed files with 69 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -361,7 +361,7 @@ func GetStoreOrderSkuList(db *DaoDB, storeIDs []int, finishedAtBegin, finishedAt
FROM order_sku t1
JOIN goods_order t2 ON t2.vendor_order_id = t1.vendor_order_id AND t2.vendor_id = t1.vendor_id
LEFT JOIN store t3 ON t3.id = IF(t2.jx_store_id > 0, t2.jx_store_id, t2.store_id)
WHERE t2.order_created_at >= ? AND t2.order_created_at <= ?`
WHERE t2.order_finished_at >= ? AND t2.order_finished_at <= ?`
sqlParams := []interface{}{
finishedAtBegin,
finishedAtEnd,