diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java index 76898eca6..7dd07766d 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java @@ -396,12 +396,13 @@ public abstract class AbstractProgramLogic implements InitializingBean { BigDecimal sumUsedElectricity = sharpUsedElectricity.add(peakUsedElectricity) .add(flatUsedElectricity).add(valleyUsedElectricity); // data中的总用电量 - BigDecimal totalElectricity = new BigDecimal(data.getTotalElectricity()); - if (sumUsedElectricity.compareTo(totalElectricity) != 0) { - // 汇总数据和data中数据不相等,取汇总的数据 - totalElectricity = sumUsedElectricity; - } - orderDetail.setTotalUsedElectricity(totalElectricity); + BigDecimal totalElectricity = new BigDecimal(StringUtils.isBlank(data.getTotalElectricity()) ? Constants.ZERO : data.getTotalElectricity()); + // if (sumUsedElectricity.compareTo(totalElectricity) != 0) { + // // 汇总数据和data中数据不相等,取汇总的数据 + // totalElectricity = sumUsedElectricity; + // } + // totalElectricity = sumUsedElectricity与totalElectricity, 取最大的值 + orderDetail.setTotalUsedElectricity(totalElectricity.max(sumUsedElectricity)); // 订单总金额 orderDetail.setTotalOrderAmount(orderAmount); } catch (Exception e) {