From 16137f911ebb8a6429513685266a1c2da385db88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 6 May 2025 17:39:55 +0800 Subject: [PATCH] 1 --- business/model/dao/store.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/business/model/dao/store.go b/business/model/dao/store.go index a6945af11..36f068179 100644 --- a/business/model/dao/store.go +++ b/business/model/dao/store.go @@ -3,6 +3,7 @@ package dao import ( "errors" "fmt" + "git.rosy.net.cn/jx-callback/globals" "sort" "strings" "time" @@ -1692,10 +1693,14 @@ func StatisticsIncome(db *DaoDB, startTime, endTime time.Time, storeId int, bran parma = append(parma, vendorId) } - sql += ` GROUP BY t1.jx_store_id ORDER BY order_count desc ` + sql += ` GROUP BY t1.jx_store_id` + sql2 := ` select settle.id,count(settle.vendor_order_id) order_count,settle.name name,sum(settle.total_income) total_income,sum(settle.jx_income) jx_income,sum(settle.market_income) market_income, sum(settle.order_sku_price) order_sku_price from ( ` + sql + `) AS settle GROUP BY id ORDER BY order_count desc` + + globals.SugarLogger.Debugf("-----sql := %s", sql2) + globals.SugarLogger.Debugf("-----parma := %s", utils.Format4Output(parma, false)) incomeInfo := make([]*StatisticsIncomeInfo, 0, 0) - if err := GetRows(db, &incomeInfo, sql, parma...); err != nil { + if err := GetRows(db, &incomeInfo, sql2, parma...); err != nil { return nil, err }