This commit is contained in:
邹宗楠
2025-12-22 18:20:29 +08:00
parent 37d7e9edd8
commit c2937005ca
2 changed files with 37 additions and 37 deletions

View File

@@ -2025,15 +2025,15 @@ func StaticStoreOrderChange(db *DaoDB, storeId []int, start, end time.Time, rank
dailyOrders += ` AND g.jx_store_id IN (` + GenQuestionMarks(len(storeId)) + `)`
dailyParam = append(dailyParam, storeId)
}
if utils.IsTimeZero(start) {
if !utils.IsTimeZero(start) {
dailyOrders += ` AND g.order_created_at >= ?`
dailyParam = append(dailyParam, start)
}
if utils.IsTimeZero(end) {
if !utils.IsTimeZero(end) {
dailyOrders += ` AND g.order_created_at <= ?`
dailyParam = append(dailyParam, start)
}
dailyOrders += ` AND g.status <> 115 GROUP BY g.jx_store_id,DATE(g.order_created_at) AS daily_orders `
dailyOrders += ` AND g.status <> 115 GROUP BY g.jx_store_id,DATE(g.order_created_at) )AS daily_orders `
storeTotals := `
SELECT
@@ -2049,11 +2049,11 @@ func StaticStoreOrderChange(db *DaoDB, storeId []int, start, end time.Time, rank
storeTotals += ` AND g.jx_store_id IN (` + GenQuestionMarks(len(storeId)) + `)`
dailyParam = append(dailyParam, storeId)
}
if utils.IsTimeZero(start) {
if !utils.IsTimeZero(start) {
storeTotals += ` AND g.order_created_at >= ?`
dailyParam = append(dailyParam, start)
}
if utils.IsTimeZero(end) {
if !utils.IsTimeZero(end) {
storeTotals += ` AND g.order_created_at <= ?`
dailyParam = append(dailyParam, start)
}
@@ -2069,7 +2069,7 @@ func StaticStoreOrderChange(db *DaoDB, storeId []int, start, end time.Time, rank
FROM (
`
lastSql += dailyOrders
lastSql += `JOIN ` + storeTotals
lastSql += `JOIN (` + storeTotals
lastSql += `ON daily_orders.jx_store_id = store_totals.jx_store_id
JOIN store s ON s.id = daily_orders.jx_store_id
ORDER BY store_totals.total_orders ?,daily_orders.jx_store_id,daily_orders.order_date`