Pārlūkot izejas kodu

add 兑换码订单

zoujiajian 3 gadi atpakaļ
vecāks
revīzija
6b9a6b4dcf

+ 5 - 0
netflix-dao/src/main/java/com/cyksj/model/entity/AppleOneData.java

@@ -16,4 +16,9 @@ public class AppleOneData extends AbstractBackData{
 	 * 区域名称
 	 */
 	private String areaName;
+
+	/**
+	 * 兑换码订单
+	 */
+	private Integer numOfCodeOrder;
 }

+ 5 - 0
netflix-dao/src/main/java/com/cyksj/model/entity/StreamingAccountData.java

@@ -21,4 +21,9 @@ public class StreamingAccountData extends AbstractBackData {
 	 * 平台id
 	 */
 	private Long goodsId;
+
+	/**
+	 * 兑换码订单
+	 */
+	private Integer numOfCodeOrder;
 }

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

@@ -117,6 +117,9 @@ public class StatisticsDataScheduler {
 			appleOne.setNumOfUser(numOfUser.size());
 			//订单数
 			appleOne.setNumOfOrder(orderDons.size());
+			//兑换码订单数
+			List<OrderDon> exCodeOrders = Optional.ofNullable(orderDons.stream().filter(order -> order.getType() == OrderDon.Type.EX_CODE).collect(Collectors.toList())).orElse(new ArrayList<>());
+			appleOne.setNumOfCodeOrder(exCodeOrders.size());
 			//金额
 			Optional<BigDecimal> money = orderDons.stream().map(OrderDon::getMoney).reduce(BigDecimal::add);
 			if (money.isPresent()) {
@@ -201,6 +204,9 @@ public class StatisticsDataScheduler {
 			//用户数
 			streamingAccountData.setNumOfUser(orderDons.stream().map(OrderDon::getUserId).collect(Collectors.toSet()).size());
 			getNumOfOrderByPayType(orderDons, streamingAccountData);
+			//兑换码订单数
+			List<OrderDon> exCodeOrders = Optional.ofNullable(orderDons.stream().filter(order -> order.getType() == OrderDon.Type.EX_CODE).collect(Collectors.toList())).orElse(new ArrayList<>());
+			streamingAccountData.setNumOfCodeOrder(exCodeOrders.size());
 			streamingAccountData.setNumOfOrder(orderDons.size());
 			Optional<BigDecimal> reduce = orderDons.stream().map(OrderDon::getMoney).reduce(BigDecimal::add);
 			BigDecimal totalMoney = BigDecimal.valueOf(0);