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

修改

Browse Source
This commit is contained in:
邹宗楠
2023-04-14 16:00:31 +08:00
parent a9210d8705
commit 85d26b6991
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
business/jxcallback/orderman/orderman_ext.go
View File

@@ -1075,8 +1075,13 @@ func (c *OrderManager) GetStoresOrderSaleInfoNew(ctx *jxcontext.Context, storeID
} }
for _, v := range saleInfoMap { for _, v := range saleInfoMap {
if v.Status == model.OrderStatusFinished { 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) globals.SugarLogger.Debugf("============err :%v", err)
for _, s := range settle {
if v.VendorID == s.VendorID {
v.PlatformSettlement = s.TotalShopMoney
}
}
} }
saleInfoList = append(saleInfoList, v) saleInfoList = append(saleInfoList, v)
} }

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

@@ -413,7 +413,12 @@ func GetStoreOrderSkuList(db *DaoDB, storeIDs []int, finishedAtBegin, finishedAt
return skuList, err 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 := ` sql := `
SELECT SUM(t2.total_shop_money) total_shop_money FROM goods_order t2 WHERE t2.order_finished_at >= ? AND t2.order_finished_at <= ? 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 = ? ` sql += ` AND t2.status = ? `
sqlParams = append(sqlParams, model.OrderStatusFinished) sqlParams = append(sqlParams, model.OrderStatusFinished)
//var count struct { var total []*TotalShopMoney
// Count int64 `json:"count"` err := GetRows(db, &total, sql, sqlParams...)
//} return total, err
var count int64 = 0
err := GetRow(db, &count, sql, sqlParams...)
return count, err
} }
func GetStoreOrderSkuList4Afs(db *DaoDB, storeIDs []int, finishedAtBegin, finishedAtEnd time.Time, isFinish bool) (skuList []*OrderSkuWithActualPayPrice, err error) { func GetStoreOrderSkuList4Afs(db *DaoDB, storeIDs []int, finishedAtBegin, finishedAtEnd time.Time, isFinish bool) (skuList []*OrderSkuWithActualPayPrice, err error) {