From 9be4a65e0365bfb4a463a9ae1a5e6280e0f69c15 Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Fri, 11 Apr 2025 11:28:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A4=E6=96=AD=E8=80=97=E7=94=B5=E9=87=8F?=
 =?UTF-8?q?=E5=A4=A7=E4=BA=8E0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pile/service/programlogic/AbstractProgramLogic.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 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 068a31724..109687e28 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
@@ -956,7 +956,7 @@ public abstract class AbstractProgramLogic implements InitializingBean {
 
             // 尖时段用电量
             BigDecimal sharpUsedElectricity = orderDetail.getSharpUsedElectricity();
-            if (sharpUsedElectricity != null) {
+            if (sharpUsedElectricity != null && sharpUsedElectricity.compareTo(BigDecimal.ZERO) > 0) {
                 logger.info("计算订单折扣V2:【{}】, 当前为尖时段, 用电量:{}, orderDetail记录的单价({} + {}), 优惠模板单价({} - {})",
                         orderCode, sharpUsedElectricity, orderDetail.getSharpElectricityPrice(), orderDetail.getSharpServicePrice(), billingTemplateVO.getSharpElectricityPrice(), billingTemplateVO.getSharpServicePrice());
                 // 该时段电费单价与orderDetail中的电价比较取最小值
@@ -979,7 +979,7 @@ public abstract class AbstractProgramLogic implements InitializingBean {
 
             // 峰时段用电量
             BigDecimal peakUsedElectricity = orderDetail.getPeakUsedElectricity();
-            if (peakUsedElectricity != null) {
+            if (peakUsedElectricity != null && peakUsedElectricity.compareTo(BigDecimal.ZERO) > 0) {
                 logger.info("计算订单折扣V2:【{}】, 当前为峰时段, 用电量:{}, orderDetail记录的单价({} + {}), 优惠模板单价({} - {})",
                         orderCode, peakUsedElectricity, orderDetail.getPeakElectricityPrice(), orderDetail.getPeakServicePrice(), billingTemplateVO.getPeakElectricityPrice(), billingTemplateVO.getPeakServicePrice());
                 // 计算该时段电费单价
@@ -999,7 +999,7 @@ public abstract class AbstractProgramLogic implements InitializingBean {
 
             // 平时段用电量
             BigDecimal flatUsedElectricity = orderDetail.getFlatUsedElectricity();
-            if (flatUsedElectricity != null) {
+            if (flatUsedElectricity != null && flatUsedElectricity.compareTo(BigDecimal.ZERO) > 0) {
                 logger.info("计算订单折扣V2:【{}】, 当前为平时段, 用电量:{}, orderDetail记录的单价({} + {}), 优惠模板单价({} - {})",
                         orderCode, flatUsedElectricity, orderDetail.getFlatElectricityPrice(), orderDetail.getFlatServicePrice(), billingTemplateVO.getFlatElectricityPrice(), billingTemplateVO.getFlatServicePrice());
                 // 计算该时段电费单价
@@ -1019,7 +1019,7 @@ public abstract class AbstractProgramLogic implements InitializingBean {
 
             // 谷时段用电量
             BigDecimal valleyUsedElectricity = orderDetail.getValleyUsedElectricity();
-            if (valleyUsedElectricity != null) {
+            if (valleyUsedElectricity != null && valleyUsedElectricity.compareTo(BigDecimal.ZERO) > 0) {
                 logger.info("计算订单折扣V2:【{}】, 当前为谷时段, 用电量:{}, orderDetail记录的单价({} + {}), 优惠模板单价({} - {})",
                         orderCode, valleyUsedElectricity, orderDetail.getValleyElectricityPrice(), orderDetail.getValleyServicePrice(), billingTemplateVO.getValleyElectricityPrice(), billingTemplateVO.getValleyServicePrice());
                 // 计算该时段电费单价