fix 兑换码订单字段

netflix-dao/src/main/resources/mapper/AppleOneDataMapper.xml

@@ -10,7 +10,8 @@
         cast(sum(money)/100 as decimal(20,2)) as money,
         sum(num_of_month_order) as num_of_month_order,
         sum(num_of_season_order) as num_of_season_order,
-        sum(num_of_year_order) as num_of_year_order
+        sum(num_of_year_order) as num_of_year_order,
+        sum(num_of_code_order) as num_of_code_order
         from `apple_one_data`
         <where>
             <if test="startDate != null">

netflix-dao/src/main/resources/mapper/StreamingAccountDataMapper.xml

@@ -11,7 +11,8 @@
                cast(sum(money)/100 as decimal(20,2)) as money,
                sum(num_of_month_order) as num_of_month_order,
                sum(num_of_season_order) as num_of_season_order,
-               sum(num_of_year_order) as num_of_year_order
+               sum(num_of_year_order) as num_of_year_order,
+               sum(num_of_code_order) as num_of_code_order
         from `streaming_account_data`
         <where>
             <if test="startDate != null">

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

@@ -154,7 +154,7 @@ public class StatisticsDataServiceImpl implements StatisticsDataService {
 		//总订单金额
 		backgroundDataView.setTotalOrderAmount(totalMoney.isPresent() ? totalMoney.get().divide(BigDecimal.valueOf(100)) : BigDecimal.ZERO);
 		//退款列表
-		List<OrderDon> refundOrders = Optional.ofNullable(orderDonService.list(Wrappers.lambdaQuery(OrderDon.class).eq(OrderDon::getStatus, OrderDon.Status.refund).select(OrderDon::getId, OrderDon::getRefundMoney))).orElse(new ArrayList<>());
+		List<OrderDon> refundOrders = Optional.ofNullable(orderDonService.list(Wrappers.lambdaQuery(OrderDon.class).eq(OrderDon::getStatus, OrderDon.Status.refund).ge(ObjectUtil.isNotNull(startDate), OrderDon::getCreatedTime, startDate).le(ObjectUtil.isNotNull(endDate), OrderDon::getCreatedTime, endDate).select(OrderDon::getId, OrderDon::getRefundMoney))).orElse(new ArrayList<>());
 		backgroundDataView.setTotalNumOfRefundOrder(refundOrders.size());
 		//退款金额
 		Optional<BigDecimal> totalRefundAmount = refundOrders.stream().map(OrderDon::getRefundMoney).reduce(BigDecimal::add);