From 85d26b69918d3299b617180581ba8d437d963ba4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 14 Apr 2023 16:00:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxcallback/orderman/orderman_ext.go | 7 ++++++- business/model/dao/dao_order.go | 16 +++++++++------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go index 4dcc220a4..7f98c892b 100644 --- a/business/jxcallback/orderman/orderman_ext.go +++ b/business/jxcallback/orderman/orderman_ext.go @@ -1075,8 +1075,13 @@ func (c *OrderManager) GetStoresOrderSaleInfoNew(ctx *jxcontext.Context, storeID } for _, v := range saleInfoMap { if v.Status == model.OrderStatusFinished { - v.PlatformSettlement, err = dao.GetPlatformSettlement(db, storeIDList, fromTime, toTime) + settle, err := dao.GetPlatformSettlement(db, storeIDList, fromTime, toTime) globals.SugarLogger.Debugf("============err :%v", err) + for _, s := range settle { + if v.VendorID == s.VendorID { + v.PlatformSettlement = s.TotalShopMoney + } + } } saleInfoList = append(saleInfoList, v) } diff --git a/business/model/dao/dao_order.go b/business/model/dao/dao_order.go index 48e29e098..d620e7b44 100644 --- a/business/model/dao/dao_order.go +++ b/business/model/dao/dao_order.go @@ -413,7 +413,12 @@ func GetStoreOrderSkuList(db *DaoDB, storeIDs []int, finishedAtBegin, finishedAt return skuList, err } -func GetPlatformSettlement(db *DaoDB, storeIDs []int, finishedAtBegin, finishedAtEnd time.Time) (int64, error) { +type TotalShopMoney struct { + TotalShopMoney int64 `json:"totalShopMoney"` + VendorID int `json:"vendorID"` +} + +func GetPlatformSettlement(db *DaoDB, storeIDs []int, finishedAtBegin, finishedAtEnd time.Time) ([]*TotalShopMoney, error) { sql := ` SELECT SUM(t2.total_shop_money) total_shop_money FROM goods_order t2 WHERE t2.order_finished_at >= ? AND t2.order_finished_at <= ? ` @@ -428,12 +433,9 @@ func GetPlatformSettlement(db *DaoDB, storeIDs []int, finishedAtBegin, finishedA sql += ` AND t2.status = ? ` sqlParams = append(sqlParams, model.OrderStatusFinished) - //var count struct { - // Count int64 `json:"count"` - //} - var count int64 = 0 - err := GetRow(db, &count, sql, sqlParams...) - return count, err + var total []*TotalShopMoney + err := GetRows(db, &total, sql, sqlParams...) + return total, err } func GetStoreOrderSkuList4Afs(db *DaoDB, storeIDs []int, finishedAtBegin, finishedAtEnd time.Time, isFinish bool) (skuList []*OrderSkuWithActualPayPrice, err error) {