fix 按时间查询

netflix-service/src/main/java/com/cyksj/service/mange/statistics/impl/StatisticsDataServiceImpl.java

@@ -519,11 +519,11 @@ public class StatisticsDataServiceImpl implements StatisticsDataService {
 		List<Account> expiredAccounts = Optional.ofNullable(accountService.list(Wrappers.lambdaQuery(Account.class).le(Account::getExpiryTime, now))).orElse(new ArrayList<>());
 		backgroundDataView.setTotalExpiredAccountNum(expiredAccounts.size());
 		//虚物
-		setGoodsMoneyAndOrder(1, backgroundDataView);
+		setGoodsMoneyAndOrder(1, startDate, endDate, backgroundDataView);
 		//实物
-		setGoodsMoneyAndOrder(2, backgroundDataView);
+		setGoodsMoneyAndOrder(2, startDate, endDate, backgroundDataView);
 		//潮玩
-		setGoodsMoneyAndOrder(3, backgroundDataView);
+		setGoodsMoneyAndOrder(3, startDate, endDate, backgroundDataView);
 	}
 
 	/**
@@ -591,10 +591,12 @@ public class StatisticsDataServiceImpl implements StatisticsDataService {
 		return refundMoney;
 	}
 
-	public void setGoodsMoneyAndOrder(Integer type, BackgroundDataView backgroundDataView) {
+	public void setGoodsMoneyAndOrder(Integer type, Date startDate, Date endDate, BackgroundDataView backgroundDataView) {
 		List<OrderDonStatisticsView> orderDonStatisticsView = Optional.ofNullable(beanSearcher.searchAll(OrderDonStatisticsView.class,
 				MapUtils.builder().field(OrderDonStatisticsView::getGoodsType, type)
-						.field(OrderDonStatisticsView::getStatus, Constant.noOrderStatus).op(Operator.NotIn).build())).orElse(new ArrayList<>());
+						.field(OrderDonStatisticsView::getStatus, Constant.noOrderStatus).op(Operator.NotIn)
+						.field(OrderDonStatisticsView::getCreateTime, startDate, endDate).op(Operator.Between)
+						.build())).orElse(new ArrayList<>());
 		Optional<BigDecimal> orderMoneyReduce = orderDonStatisticsView.stream().map(OrderDonStatisticsView::getMoney).reduce(BigDecimal::add);
 		int totalOrder = orderDonStatisticsView.size();