fix 分销统计

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

@@ -181,11 +181,10 @@ public class StatisticsDataServiceImpl implements StatisticsDataService {
 	 * @param backgroundDataView
 	 */
 	public void distribute(BackgroundDataView backgroundDataView, Date startDate, Date endDate) {
-		List<OrderDon> distributeOrders = Optional.ofNullable(orderDonService.list(Wrappers.lambdaQuery(OrderDon.class)
+		Integer distributeOrders = orderDonService.count(Wrappers.lambdaQuery(OrderDon.class)
 				.eq(OrderDon::getIsDistribute, true)
-				.ge(ObjectUtil.isNotNull(startDate), OrderDon::getCreatedTime, startDate).le(ObjectUtil.isNotNull(endDate), OrderDon::getCreatedTime, endDate)
-				.select(OrderDon::getId, OrderDon::getMoney))).orElse(new ArrayList<>());
-		backgroundDataView.setDistributeOrders(distributeOrders.size());
+				.ge(ObjectUtil.isNotNull(startDate), OrderDon::getCreatedTime, startDate).le(ObjectUtil.isNotNull(endDate), OrderDon::getCreatedTime, endDate));
+		backgroundDataView.setDistributeOrders(distributeOrders);
 		//固定推广者订单
 		List<DistributeOrdersView> distributePopularizeOrders = Optional.ofNullable(beanSearcher.searchAll(DistributeOrdersView.class, MapUtils.builder()
 				.field(DistributeOrdersView::getStatus, StatisticsDataScheduler.noOrderStatus).op(Operator.NotIn)
@@ -205,20 +204,20 @@ public class StatisticsDataServiceImpl implements StatisticsDataService {
 		//普通分销订单金额
 		Optional<BigDecimal> originalMoney = distributeOriginalOrders.stream().map(DistributeOrdersView::getMoney).reduce(BigDecimal::add);
 		backgroundDataView.setDistributePopularizeMoney(popularizeMoney.isPresent() ? popularizeMoney.get().divide(BigDecimal.valueOf(100)) : BigDecimal.ZERO);
-		backgroundDataView.setDistributeOriginalMoney(originalMoney.isPresent() ? popularizeMoney.get().divide(BigDecimal.valueOf(100)) : BigDecimal.ZERO);
+		backgroundDataView.setDistributeOriginalMoney(originalMoney.isPresent() ? originalMoney.get().divide(BigDecimal.valueOf(100)) : BigDecimal.ZERO);
 
 		List<DistributeMoneyApply> distributeMoneyApplies = Optional.ofNullable(beanSearcher.searchAll(DistributeMoneyApply.class, MapUtils.builder().field(DistributeMoneyApply::getCreatedTime, startDate, endDate).op(Operator.Between).build())).orElse(new ArrayList<>());
 		Map<DistributeMoneyApply.Status, List<DistributeMoneyApply>> collect = distributeMoneyApplies.stream().collect(Collectors.groupingBy(DistributeMoneyApply::getVerifyStatus));
 		collect.forEach((k, v) -> {
-			if (DistributeMoneyApply.Status.fail.name().equals(k)) {
+			if (DistributeMoneyApply.Status.fail == k) {
 				return;
 			}
 			Optional<BigDecimal> reduce = v.stream().map(DistributeMoneyApply::getMoney).reduce(BigDecimal::add);
 			BigDecimal money = reduce.isPresent() ? reduce.get().divide(BigDecimal.valueOf(100)) : BigDecimal.ZERO;
-			if (DistributeMoneyApply.Status.success.name().equals(k)) {
+			if (DistributeMoneyApply.Status.success == k) {
 				backgroundDataView.setDistributeGotMoney(money);
 			}
-			if (DistributeMoneyApply.Status.verifying.name().equals(k)) {
+			if (DistributeMoneyApply.Status.verifying == k) {
 				backgroundDataView.setDistributeVerifyingMoney(money);
 			}
 		});