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 17:16:11 +08:00
parent f8a8907e75
commit f7a9f3c033
1 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -311,9 +311,9 @@ func (c *OrderManager) ExportMTWaybills(ctx *jxcontext.Context, fromDateStr, toD
func (c *OrderManager) GetOrders(ctx *jxcontext.Context, isIncludeFake bool, fromDateStr, toDateStr string, isDateFinish bool, skuIDs []int, isJxFirst bool, params map[string]interface{}, offset, pageSize int) (pagedInfo *model.PagedInfo, err error) {
var (
db = dao.GetDB()
isJxIncomeArea = params["jxIncomeBegin"] != nil || params["jxIncomeEnd"] != nil
begin, end int64
db = dao.GetDB()
//isJxIncomeArea = params["jxIncomeBegin"] != nil || params["jxIncomeEnd"] != nil
//begin, end int64
)
//权限
if permission.IsRoled(ctx) {
@@ -341,13 +341,11 @@ func (c *OrderManager) GetOrders(ctx *jxcontext.Context, isIncludeFake bool, fro
}
}
}
if isJxIncomeArea {
begin = utils.MustInterface2Int64(params["jxIncomeBegin"])
end = utils.MustInterface2Int64(params["jxIncomeEnd"])
//begin := utils.MustInterface2Int64(params["jxIncomeBegin"])
//end := utils.MustInterface2Int64(params["jxIncomeEnd"])
pageSize = math.MaxInt32
}
//if isJxIncomeArea {
// begin = utils.MustInterface2Int64(params["jxIncomeBegin"])
// end = utils.MustInterface2Int64(params["jxIncomeEnd"])
// pageSize = math.MaxInt32
//}
orders, totalCount, err := dao.GetOrders(db, nil, false, isIncludeFake, fromDateStr, toDateStr, isDateFinish, skuIDs, isJxFirst, "", params, offset, pageSize)
if err == nil {
pagedInfo = &model.PagedInfo{
@@ -389,13 +387,13 @@ func (c *OrderManager) GetOrders(ctx *jxcontext.Context, isIncludeFake bool, fro
}
}
}
if isJxIncomeArea {
var order2 *model.GoodsOrderExt
if order.JxIncome >= begin && order.JxIncome <= end {
order2 = order
return []*model.GoodsOrderExt{order2}, err
}
}
//if isJxIncomeArea {
// var order2 *model.GoodsOrderExt
// if order.JxIncome >= begin && order.JxIncome <= end {
// order2 = order
// return []*model.GoodsOrderExt{order2}, err
// }
//}
return retVal, err
}, orders)
tasksch.HandleTask(task, nil, true).Run()