From 490d695aefddc62b4e78ff2ab3b3a37e56b531f4 Mon Sep 17 00:00:00 2001
From: Lemon <ziao4956@gmail.com>
Date: Mon, 28 Jul 2025 13:41:42 +0800
Subject: [PATCH] =?UTF-8?q?update=20=20=E5=A6=82=E6=9E=9C=E7=94=B5?=
 =?UTF-8?q?=E5=8D=95=E8=BD=A6=E8=AE=A2=E5=8D=95=E8=80=97=E7=94=B5=E9=87=8F?=
 =?UTF-8?q?=E4=B8=BA=200=EF=BC=8C=E8=BF=9B=E8=A1=8C=E9=80=80=E6=AC=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/programlogic/DelayMerchantProgramLogic.java  | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java
index 3ec6236ee..02635969c 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java
@@ -625,8 +625,13 @@ public class DelayMerchantProgramLogic extends AbstractProgramLogic {
             // 计算实际消费, 保留两位小数
             orderAmount = consumedEnergy.multiply(price).setScale(2, RoundingMode.UP);
         } else {
-            // 其他金额都是按次收费, 不退款
-            orderAmount = orderBasicInfo.getPayAmount();
+            // 2025.07.28如果耗电量为 0，也进行退款
+            if (consumedEnergy.compareTo(BigDecimal.ZERO) == 0) {
+                orderAmount = BigDecimal.ZERO;
+            }else {
+                // 其他金额、并且耗电量不为 0 ，都是按次收费, 不退款
+                orderAmount = orderBasicInfo.getPayAmount();
+            }
         }
 
         // 退款金额 = 支付金额 - 优惠后总消费金额