数据显示

src/main/java/com/izouma/jiashanxia/service/StatisticService.java

@@ -59,7 +59,11 @@ public class StatisticService {
         Map<Integer, List<WxFee>> collect = wxFeeRepo.findAllByCreatedAtBetween(start, now)
                 .stream()
                 .collect(Collectors.groupingBy(WxFee::getAction));
+        List<WxFee> income = new ArrayList<>();
         List<WxFee> wxFees = collect.get(0);
+        if (CollUtil.isNotEmpty(wxFees)) {
+            income = wxFees;
+        }
         List<WxFee> refunds = new ArrayList<>();
         List<WxFee> wxFees1 = collect.get(1);
         if (CollUtil.isNotEmpty(wxFees1)) {
@@ -73,7 +77,7 @@ public class StatisticService {
 //            long order = orderInfos.stream()
 //                    .filter(orderInfo -> !finalStart.isAfter(orderInfo.getPaidAt()) && end.isAfter(orderInfo.getPaidAt()))
 //                    .count();
-            BigDecimal fee = wxFees.stream()
+            BigDecimal fee = income.stream()
                     .filter(wxFee -> !finalStart.isAfter(wxFee.getCreatedAt()) && end.isAfter(wxFee.getCreatedAt()))
                     .map(WxFee::getAmount)
                     .reduce(BigDecimal.ZERO, BigDecimal::add);