From 5cb1bfb71724058d8c8a6960960d0cafb635350c Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Fri, 16 Jun 2023 13:35:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A6=82=E6=9E=9C=E7=AE=97=E5=87=BA=E6=9D=A5?= =?UTF-8?q?=E7=9A=84=E7=94=B5=E8=B4=B9=E9=87=91=E9=A2=9D=E5=A4=A7=E4=BA=8E?= =?UTF-8?q?=E6=80=BB=E6=B6=88=E8=B4=B9=E9=87=91=E9=A2=9D=EF=BC=8C=E5=88=99?= =?UTF-8?q?=E7=94=B5=E8=B4=B9=E9=87=91=E9=A2=9D=E7=AD=89=E4=BA=8E=E6=80=BB?= =?UTF-8?q?=E6=B6=88=E8=B4=B9=E9=87=91=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java | 4 ++++ 1 file changed, 4 insertions(+) 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 c9875bbca..006860fcc 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 @@ -757,6 +757,10 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { totalElectricityAmount = totalElectricityAmount.add(multiply); } + // 如果算出来的电费金额大于总消费金额，则电费金额等于总消费金额 + if (totalElectricityAmount.compareTo(orderAmount) > 0) { + totalElectricityAmount = orderAmount; + } orderDetail.setTotalElectricityAmount(totalElectricityAmount); orderDetail.setTotalServiceAmount(orderAmount.subtract(totalElectricityAmount)); orderDetail.setTotalUsedElectricity(new BigDecimal(data.getTotalElectricity())); // 总用电量