|
@@ -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;
|