From 6a626af58144c617c3e4d0dd0de1240d1d2c6daf Mon Sep 17 00:00:00 2001 From: linfso Date: Thu, 19 Jun 2025 16:39:49 +0800 Subject: [PATCH] md --- .../java/com/xdadan/erp/emis/service/EmisBaseService.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java index 4fcc47597..a83f1b4d5 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java @@ -1695,8 +1695,11 @@ public class EmisBaseService { } log.info("query emisSettleSubBillList , emisSettleSubBillList,{}", emisSettleSubBillList); BigDecimal inTermMoney = new BigDecimal(emisSettleSubBillList.stream() - .map(EmisSettleSubBill::getBillFee) - .filter(i -> i != null) + .map(bill -> { + BigDecimal billFee = bill.getBillFee() == null ? BigDecimal.ZERO : bill.getBillFee(); + BigDecimal recedMoney = bill.getRecedMoney() == null ? BigDecimal.ZERO : bill.getRecedMoney(); + return billFee.subtract(recedMoney); + }) .reduce(BigDecimal.ZERO, BigDecimal::add) .stripTrailingZeros().toPlainString()); log.info("success.getInTermMoney , inTermMoney,{}", inTermMoney);