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-06-23 16:51:15 +08:00
parent 794a31a74e
commit 05604201cb
1 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -339,6 +339,11 @@ func (c *OrderManager) GetOrders(ctx *jxcontext.Context, isIncludeFake bool, fro
}
}
}
if params["jxIncomeBegin"] != nil || params["jxIncomeEnd"] != nil {
//begin := utils.MustInterface2Int64(params["jxIncomeBegin"])
//end := utils.MustInterface2Int64(params["jxIncomeEnd"])
pageSize = math.MaxInt64
}
orders, totalCount, err := dao.GetOrders(db, nil, false, isIncludeFake, fromDateStr, toDateStr, isDateFinish, skuIDs, isJxFirst, "", params, offset, pageSize)
if err == nil {
pagedInfo = &model.PagedInfo{
@@ -385,8 +390,20 @@ func (c *OrderManager) GetOrders(ctx *jxcontext.Context, isIncludeFake bool, fro
tasksch.HandleTask(task, nil, true).Run()
task.GetResult(0)
}
if params["jxIncomeBegin"] != nil || params["jxIncomeEnd"] != nil {
var orders2 []*model.GoodsOrderExt
begin := utils.MustInterface2Int64(params["jxIncomeBegin"])
end := utils.MustInterface2Int64(params["jxIncomeEnd"])
for _, v := range orders {
if v.JxIncome >= begin && v.JxIncome <= end {
orders2 = append(orders2, v)
}
}
pagedInfo.Data = orders2
} else {
pagedInfo.Data = orders
}
}
pagedInfo.Data = orders
}
return pagedInfo, err
}