This commit is contained in:
邹宗楠
2023-04-14 11:41:42 +08:00
parent 256501cd7e
commit 850fc4f0e3
2 changed files with 26 additions and 8 deletions

View File

@@ -1019,7 +1019,7 @@ func (c *OrderManager) GetStoresOrderSaleInfoNew(ctx *jxcontext.Context, storeID
}
return orderMap, orderSkuMap, saleInfoMap
}
_, _, saleInfoMap := orderSkuHandler(orderSkuList)
_, _, saleInfoMap := orderSkuHandler(orderSkuList) // 所有订单的支付金额
orderMap, orderSkuMap, _ := orderSkuHandler(orderSkuList4Afs)
afsOrderMap := make(map[string]*model.GoodsOrder)
@@ -1074,6 +1074,9 @@ func (c *OrderManager) GetStoresOrderSaleInfoNew(ctx *jxcontext.Context, storeID
saleInfo.Count++
}
for _, v := range saleInfoMap {
if v.Status == model.OrderStatusFinished {
v.PlatformSettlement, _ = dao.GetPlatformSettlement(db, storeIDList, fromTime, toTime)
}
saleInfoList = append(saleInfoList, v)
}
return saleInfoList, err