财务导出

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ExportServiceImpl.java

@@ -2406,18 +2406,19 @@ public class ExportServiceImpl implements ExportService {
                 return;
             }
         }
-        if(!detailList.stream().anyMatch(e-> e.getIncome().compareTo(BigDecimal.ZERO) == 0)){
+        List<StudentPaymentOrderDetail> details = detailList.stream().filter(e -> e.getIncome().compareTo(BigDecimal.ZERO) == 0).collect(Collectors.toList());
+        if(CollectionUtils.isEmpty(details)){
             return;
         }
         //订单详情去除余额部分
-        calculateOrderDetailActualAmount(basicOrder.getExpectAmount(),basicOrder.getBalancePaymentAmount(),detailList);
+        calculateOrderDetailActualAmount(basicOrder.getExpectAmount(),basicOrder.getBalancePaymentAmount(),details);
         if(basicOrder.getServiceAmount().compareTo(BigDecimal.ZERO) > 0){
             //计算服务收入
-            detailList.stream().forEach(e->this.setServiceFee(basicOrder,e,userFirstVipMap));
+            details.stream().forEach(e->this.setServiceFee(basicOrder,e,userFirstVipMap));
         }
         if(basicOrder.getSaleAmount().compareTo(BigDecimal.ZERO) > 0){
             //计算销售收入
-            detailList.stream().forEach(e->this.setSaleFee(basicOrder,e));
+            details.stream().forEach(e->this.setSaleFee(basicOrder,e));
         }
     }