zoujiajian преди 3 години
родител
ревизия
e6c01874bf
променени са 1 файла, в които са добавени 11 реда и са изтрити 0 реда
  1. 11 0
      netflix-service/src/main/java/com/cyksj/task/StatisticsDataScheduler.java

+ 11 - 0
netflix-service/src/main/java/com/cyksj/task/StatisticsDataScheduler.java

@@ -173,6 +173,12 @@ public class StatisticsDataScheduler {
 			if (money.isPresent()) {
 			if (money.isPresent()) {
 				appleOne.setMoney(money.get());
 				appleOne.setMoney(money.get());
 			} else appleOne.setMoney(BigDecimal.ZERO);
 			} else appleOne.setMoney(BigDecimal.ZERO);
+			//分销订单
+			List<OrderDon> distributeOrders = Optional.ofNullable(orderDons.stream().filter(ord -> ord.getIsDistribute()).collect(Collectors.toList())).orElse(new ArrayList<>());
+			appleOne.setNumOfDistributeOrder(distributeOrders.size());
+			Optional<BigDecimal> distributeMoney = distributeOrders.stream().map(OrderDon::getMoney).reduce(BigDecimal::add);
+			appleOne.setDistributeOrderMoney(distributeMoney.isPresent() ? distributeMoney.get() : BigDecimal.ZERO);
+
 			getNumOfOrderByPayType(orderDons, appleOne);
 			getNumOfOrderByPayType(orderDons, appleOne);
 		}
 		}
 		appleOneSave.add(appleOne);
 		appleOneSave.add(appleOne);
@@ -263,6 +269,11 @@ public class StatisticsDataScheduler {
 			}
 			}
 			//金额
 			//金额
 			streamingAccountData.setMoney(totalMoney);
 			streamingAccountData.setMoney(totalMoney);
+			//分销订单
+			List<OrderDon> distributeOrders = Optional.ofNullable(orderDons.stream().filter(ord -> ord.getIsDistribute()).collect(Collectors.toList())).orElse(new ArrayList<>());
+			streamingAccountData.setNumOfDistributeOrder(distributeOrders.size());
+			Optional<BigDecimal> distributeMoney = distributeOrders.stream().map(OrderDon::getMoney).reduce(BigDecimal::add);
+			streamingAccountData.setDistributeOrderMoney(distributeMoney.isPresent() ? distributeMoney.get() : BigDecimal.ZERO);
 		}
 		}
 		dataSave.add(streamingAccountData);
 		dataSave.add(streamingAccountData);
 	}
 	}