From 1258ab42eb2f6419659bc51f9f0f2d8906aea69d Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Fri, 14 Jul 2023 14:53:12 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=E8=AE=A1=E7=AE=97?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=97=A5=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/OrderBasicInfoServiceImpl.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index b3f057afa..4b3ee50e8 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -2115,15 +2115,23 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { } // 电费金额 - totalElectricityAmount = totalElectricityAmount.add(vo.getTotalElectricityAmount()); + BigDecimal e = vo.getTotalElectricityAmount() != null ? vo.getTotalElectricityAmount() : BigDecimal.ZERO; + totalElectricityAmount = totalElectricityAmount.add(e); + // 服务费金额 - totalServiceAmount = totalServiceAmount.add(vo.getTotalServiceAmount()); + BigDecimal serviceAmount = vo.getTotalServiceAmount() != null ? vo.getTotalServiceAmount() : BigDecimal.ZERO; + totalServiceAmount = totalServiceAmount.add(serviceAmount); + // 订单金额 totalOrderAmount = totalOrderAmount.add(new BigDecimal(orderAmount)); + // 虚拟金额 - totalVirtualAmount = totalVirtualAmount.add(new BigDecimal(vo.getVirtualAmount())); + String virtualAmount = StringUtils.isNotBlank(vo.getVirtualAmount()) ? vo.getVirtualAmount() : Constants.ZERO; + totalVirtualAmount = totalVirtualAmount.add(new BigDecimal(virtualAmount)); + // 结算金额 - totalSettleAmount = totalSettleAmount.add(new BigDecimal(vo.getSettleAmount())); + String settleAmount = StringUtils.isNotBlank(vo.getSettleAmount()) ? vo.getSettleAmount() : Constants.ZERO; + totalSettleAmount = totalSettleAmount.add(new BigDecimal(settleAmount)); } // 计算报表