diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go index 0ecd24580..2b176d662 100644 --- a/business/jxcallback/orderman/orderman_ext.go +++ b/business/jxcallback/orderman/orderman_ext.go @@ -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()