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())); // 总用电量