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

修改反馈

Browse Source
This commit is contained in:
Rosy-zhudan
2019-10-10 09:42:41 +08:00
parent de617fbc49
commit 1c5c0bbbcc
4 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -444,8 +444,8 @@ func GetStandardPickTimeOrderCountByDaDa(db *DaoDB, dayNum int, includeToday boo
sql := `
SELECT t1.jx_store_id store_id, COUNT(*) count
FROM goods_order t1
JOIN order_status t2 ON t2.vendor_order_id = t1.vendor_order_id
where t1.order_finished_at >= ? AND t1.order_finished_at <= ?
JOIN order_status t2 ON t1.vendor_order_id = t2.vendor_order_id AND t1.vendor_id = t2.vendor_id
WHERE t1.order_finished_at >= ? AND t1.order_finished_at <= ?
AND t1.status = ?
AND t1.waybill_vendor_id = ?
AND t2.order_type = ?
@@ -471,7 +471,7 @@ func GetStandardFinishTimeOrderCountBySelfDelivery(db *DaoDB, dayNum int, includ
sql := `
SELECT jx_store_id store_id, order_created_at, order_finished_at
FROM goods_order
where order_finished_at >= ? AND order_finished_at <= ?
WHERE order_finished_at >= ? AND order_finished_at <= ?
AND status = ?
AND waybill_vendor_id = ?
`
@@ -506,8 +506,8 @@ func GetStandardPickUpTimeOrderCountByDaDa(db *DaoDB, dayNum int, includeToday b
sql := `
SELECT t1.jx_store_id store_id, t1.vendor_order_id, t2.status_time, t2.status
FROM goods_order t1
JOIN order_status t2 ON t2.vendor_order_id = t1.vendor_order_id
where t1.order_finished_at >= ? AND t1.order_finished_at <= ?
JOIN order_status t2 ON t1.vendor_order_id = t2.vendor_order_id AND t1.vendor_id = t2.vendor_id
WHERE t1.order_finished_at >= ? AND t1.order_finished_at <= ?
AND t1.status = ?
AND t1.waybill_vendor_id = ?
AND t2.status in (?, ?)