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

1\

Browse Source
This commit is contained in:
邹宗楠
2025-07-04 10:03:38 +08:00
parent 9a051bf147
commit 905f8bd2e0
7 changed files with 81 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -943,7 +943,7 @@ func (c *OrderManager) GetStoresOrderSaleInfo(ctx *jxcontext.Context, storeIDLis
return c.GetStoresOrderSaleInfoNew(ctx, storeIDList, fromTime, toTime, statusList)
}
func (c *OrderManager) GetStoresOrderSaleInfo2(ctx *jxcontext.Context, fromTime time.Time, toTime time.Time, storeId int, brandId, vendorId, storeList []int) (map[string]interface{}, error) {
func (c *OrderManager) GetStoresOrderSaleInfo2(fromTime time.Time, toTime time.Time, storeId int, brandId, vendorId, storeList []int, operateNum, brandOperate string) (map[string]interface{}, error) {
var (
db = dao.GetDB()
)
@@ -957,25 +957,25 @@ func (c *OrderManager) GetStoresOrderSaleInfo2(ctx *jxcontext.Context, fromTime
}
// 门店统计
storeStatus, err := dao.StatisticsStoreInfo(db, brandId, vendorId, storeList)
storeStatus, err := dao.StatisticsStoreInfo(db, brandId, vendorId, storeList, operateNum, brandOperate)
if err != nil {
return nil, err
}
// 订单统计
orderStatus, err := dao.StatisticsOrderInfo(db, fromTime, toTime, storeId, brandId, vendorId, storeList)
orderStatus, err := dao.StatisticsOrderInfo(db, fromTime, toTime, storeId, brandId, vendorId, storeList, operateNum, brandOperate)
if err != nil {
return nil, err
}
// 售后单统计
afsOrderStatus, err := dao.StatisticsAfsOrderInfo(db, fromTime, toTime, storeId, brandId, vendorId, storeList)
afsOrderStatus, err := dao.StatisticsAfsOrderInfo(db, fromTime, toTime, storeId, brandId, vendorId, storeList, operateNum, brandOperate)
if err != nil {
return nil, err
}
// 统计收益
incomeStatics, err := dao.StatisticsIncome(db, fromTime, toTime, storeId, brandId, vendorId, storeList)
incomeStatics, err := dao.StatisticsIncome(db, fromTime, toTime, storeId, brandId, vendorId, storeList, operateNum, brandOperate)
if err != nil {
return nil, err
}