Browse Source

fix 修改统计接口

DYH2020 2 years ago
parent
commit
22159fa558
1 changed files with 4 additions and 2 deletions
  1. 4 2
      src/main/java/com/ywt/mg/services/RegisteredOrderService.java

+ 4 - 2
src/main/java/com/ywt/mg/services/RegisteredOrderService.java

@@ -570,8 +570,10 @@ public class RegisteredOrderService {
             paymentList = paymentList.stream().filter(p -> !Checker.isNone(p.getPaymentTime()) && p.getPaymentTime().before(billEndTime)).collect(Collectors.toList());
             refundList = refundList.stream().filter(p -> !Checker.isNone(p.getRefundTime()) && p.getRefundTime().before(billEndTime)).collect(Collectors.toList());
         }
-        int payTotal = paymentList.stream().filter(p -> Checker.getIntegerValue(p.getPaymentStatus()) == PaymentStatusEnum.Success.getValue()).mapToInt(RegisteredOrder::getTotal).sum();
-        int refundTotal = refundList.stream().filter(p -> Checker.getIntegerValue(p.getRefundStatus()) == RefundStatusEnum.SUCCESS.getValue()).mapToInt(RegisteredOrder::getTotal).sum();
+        paymentList = paymentList.stream().filter(p -> Checker.getIntegerValue(p.getPaymentStatus()) == PaymentStatusEnum.Success.getValue()).collect(Collectors.toList());
+        refundList = refundList.stream().filter(p -> Checker.getIntegerValue(p.getRefundStatus()) == RefundStatusEnum.SUCCESS.getValue()).collect(Collectors.toList());
+        int payTotal = paymentList.stream().mapToInt(RegisteredOrder::getTotal).sum();
+        int refundTotal = refundList.stream().mapToInt(RegisteredOrder::getTotal).sum();
 
         int startRows = size + 2;
         int startColumn = 0;