diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java index cfb836bb4..2b0c9bd09 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java @@ -378,7 +378,11 @@ public class SettleOrderReportServiceImpl implements SettleOrderReportService { chargeTime = chargeTime.add(new BigDecimal(settleOrderReportVO.getChargeTime())); electricityAmount = electricityAmount.add(settleOrderReportVO.getElectricityAmount()); serviceAmount = serviceAmount.add(settleOrderReportVO.getServiceAmount()); - totalAmount = totalAmount.add(settleOrderReportVO.getSettleAmount()); // 2024年11月12日14点30分使用结算金额计算收入金额 + // 2024年11月12日14点30分使用结算金额计算收入金额 + BigDecimal amount = settleOrderReportVO.getSettleAmount() != null + ? settleOrderReportVO.getSettleAmount() + : settleOrderReportVO.getTotalAmount(); + totalAmount = totalAmount.add(amount); virtualAmount = virtualAmount.add(settleOrderReportVO.getVirtualAmount()); } // 用电度数