From 05604201cb2cddd0bd29472e4caad88333cbaf61 Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Wed, 23 Jun 2021 16:51:15 +0800
Subject: [PATCH] aa

---
 business/jxcallback/orderman/orderman_ext.go | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go
index 04087ce0c..975ea7f94 100644
--- a/business/jxcallback/orderman/orderman_ext.go
+++ b/business/jxcallback/orderman/orderman_ext.go
@@ -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
 }