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

aa

Browse Source
This commit is contained in:
suyl
2021-08-14 13:58:09 +08:00
parent 7b4fecc3ec
commit b26842caf8
3 changed files with 55 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -821,18 +821,27 @@ func (c *OrderManager) GetStoresOrderSaleInfoNew(ctx *jxcontext.Context, storeID
if toTime.Sub(fromTime).Hours() > 24 {
isLongTime = true
}
orderIDMap := make(map[string]struct{})
var vendorOrderIDs []string
orderSkuList, err := dao.GetStoreOrderSkuList(db, storeIDList, fromTime, toTime, statusList, true)
if err != nil {
return nil, err
}
afsSkuList, err := dao.GetStoreAfsOrderSkuList(db, storeIDList, fromTime, toTime, []int{model.AfsOrderStatusFinished}, true)
if err != nil {
return nil, err
for _, v := range orderSkuList {
orderIDMap[v.VendorOrderID] = struct{}{}
}
orderSkuList4Afs, err := dao.GetStoreOrderSkuList4Afs(db, storeIDList, fromTime, toTime, true)
if err != nil {
return nil, err
for k, _ := range orderIDMap {
vendorOrderIDs = append(vendorOrderIDs, k)
}
afsSkuList, err := dao.GetStoreAfsOrderSkuList2(db, vendorOrderIDs)
//afsSkuList, err := dao.GetStoreAfsOrderSkuList(db, storeIDList, fromTime, toTime, []int{model.AfsOrderStatusFinished}, true)
//if err != nil {
// return nil, err
//}
orderSkuList4Afs, err := dao.GetStoreOrderSkuList4Afs2(db, vendorOrderIDs)
//if err != nil {
// return nil, err
//}
orderSkuHandler := func(skuList []*dao.OrderSkuWithActualPayPrice) (orderMap map[string]*model.GoodsOrder, orderSkuMap map[string]*dao.OrderSkuWithActualPayPrice, saleInfoMap map[int64]*dao.StoresOrderSaleInfo) {
orderMap = make(map[string]*model.GoodsOrder)
orderSkuMap = make(map[string]*dao.OrderSkuWithActualPayPrice)