From dd2eb3365c63cff55ce65881399fa34d3c115ee7 Mon Sep 17 00:00:00 2001 From: Lemon Date: Thu, 6 Nov 2025 08:32:57 +0800 Subject: [PATCH] =?UTF-8?q?bug=20fix=20=E4=BF=AE=E5=A4=8D=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E7=BB=93=E7=AE=97=E7=A9=BA=E6=8C=87=E9=92=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../programlogic/AbstractProgramLogic.java | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) 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 571654ba6..108bce6d1 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 @@ -656,24 +656,24 @@ public abstract class AbstractProgramLogic implements InitializingBean { orderDetail需要更新的字段 */ // 如果sharpUsedElectricity比orderDetail.getSharpUsedElectricity大，则更新sharpUsedElectricity - if (sharpUsedElectricity.compareTo(orderDetail.getSharpUsedElectricity()) > 0) { - orderDetail.setSharpUsedElectricity(sharpUsedElectricity); // 尖时段用电量 - } - - // 如果peakUsedElectricity比orderDetail.getPeakUsedElectricity大，则更新 - if (peakUsedElectricity.compareTo(orderDetail.getPeakUsedElectricity()) > 0) { - orderDetail.setPeakUsedElectricity(peakUsedElectricity); // 峰时段用电量 - } - - // 如果flatUsedElectricity比orderDetail.getFlatUsedElectricity大，则更新 - if (flatUsedElectricity.compareTo(orderDetail.getFlatUsedElectricity()) > 0) { - orderDetail.setFlatUsedElectricity(flatUsedElectricity); // 平时段用电量 - } - - // 如果valleyUsedElectricity比orderDetail.getValleyUsedElectricity大，则更新 - if (valleyUsedElectricity.compareTo(orderDetail.getValleyUsedElectricity()) > 0) { - orderDetail.setValleyUsedElectricity(valleyUsedElectricity); // 谷时段用电量 - } + // if (sharpUsedElectricity.compareTo(orderDetail.getSharpUsedElectricity()) > 0) { + // orderDetail.setSharpUsedElectricity(sharpUsedElectricity); // 尖时段用电量 + // } + // + // // 如果peakUsedElectricity比orderDetail.getPeakUsedElectricity大，则更新 + // if (peakUsedElectricity.compareTo(orderDetail.getPeakUsedElectricity()) > 0) { + // orderDetail.setPeakUsedElectricity(peakUsedElectricity); // 峰时段用电量 + // } + // + // // 如果flatUsedElectricity比orderDetail.getFlatUsedElectricity大，则更新 + // if (flatUsedElectricity.compareTo(orderDetail.getFlatUsedElectricity()) > 0) { + // orderDetail.setFlatUsedElectricity(flatUsedElectricity); // 平时段用电量 + // } + // + // // 如果valleyUsedElectricity比orderDetail.getValleyUsedElectricity大，则更新 + // if (valleyUsedElectricity.compareTo(orderDetail.getValleyUsedElectricity()) > 0) { + // orderDetail.setValleyUsedElectricity(valleyUsedElectricity); // 谷时段用电量 + // } orderDetail.setTotalElectricityAmount(totalElectricityAmount); // 电费总金额 orderDetail.setTotalServiceAmount(totalServiceAmount); // 服务费总金额