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

刷新历史订单结算价

Browse Source
This commit is contained in:
苏尹岚
2019-11-08 15:23:18 +08:00
parent 622d53cb4e
commit b44f41d9d0
2 changed files with 62 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -68,6 +68,26 @@ func QueryOrders(db *DaoDB, vendorOrderID string, actID int, vendorIDs []int, st
b.vendor_price sku_vendor_price, b.sale_price sku_sale_price, b.earning_price sku_earning_price, b.weight, b.sku_type, b.promotion_type
FROM goods_order a
JOIN order_sku b ON a.vendor_order_id = b.vendor_order_id
`
if actID > 0 {
sql += `
JOIN ( SELECT t4.vendor_order_id, t4.vendor_id
FROM act t1
JOIN act_store_sku t2 ON t2.act_id = t1.id
JOIN order_sku t3 ON t3.sku_id = t2.sku_id
JOIN goods_order t4 ON t4.vendor_order_id = t3.vendor_order_id
AND t4.vendor_id = t3.vendor_id
AND t2.store_id = IF(t4.jx_store_id <> 0, t4.jx_store_id, t4.store_id)
AND t4.order_created_at BETWEEN t1.begin_at AND t1.end_at
WHERE t1.status = 1
AND t1.type = ?
AND t1.id = ?
GROUP BY 1,2
)s ON s.vendor_order_id = a.vendor_order_id AND s.vendor_id = a.vendor_id
`
sqlParams = append(sqlParams, model.ActSkuFake, actID)
}
sql += `
WHERE 1=1
`
if vendorOrderID != "" {
@@ -86,24 +106,6 @@ func QueryOrders(db *DaoDB, vendorOrderID string, actID int, vendorIDs []int, st
sql += " AND a.order_created_at BETWEEN ? and ?"
sqlParams = append(sqlParams, fromDate, toDate)
}
if actID > 0 {
sql += `
AND a.vendor_order_id IN
( SELECT DISTINCT t4.vendor_order_id
FROM act t1
JOIN act_store_sku t2 ON t2.act_id = t1.id
JOIN order_sku t3 ON t3.sku_id = t2.sku_id
JOIN goods_order t4 ON t4.vendor_order_id = t3.vendor_order_id
AND t4.vendor_id = t3.vendor_id
AND t2.store_id = IF(t4.jx_store_id <> 0, t4.jx_store_id, t4.store_id)
AND t4.order_created_at BETWEEN t1.begin_at AND t1.end_at
WHERE t1.status = 1
AND t1.type = ?
AND t1.id = ?
)
`
sqlParams = append(sqlParams, model.ActSkuFake, actID)
}
err = GetRows(db, &orderNewList, sql, sqlParams...)
if len(orderNewList) > 0 {
orderNewMap = make(map[string][]*model.OrderSku)