From df356558b5cd8bd8750762af225b75cb5edaf286 Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Fri, 29 Nov 2024 16:22:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/programlogic/AbstractProgramLogic.java     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 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 74064b705..1b868cfcf 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
@@ -734,16 +734,16 @@ public abstract class AbstractProgramLogic implements InitializingBean {
             }
 
             // 计算优惠了多少钱
-            // 电费折扣金额
+            // 电费折扣金额 = 优惠前电费 - 优惠后电费
             electricityAmountDiscount = originalTotalElectricityAmount.subtract(afterDiscountElectricityAmount);
-            // 服务费折扣金额
+            // 服务费折扣金额 = 优惠前服务费 - 优惠后服务费
             serviceAmountDiscount = originalTotalServiceAmount.subtract(afterDiscountServiceAmount);
         }
 
         /*
         更新 数据
          */
-        // 订单折扣金额
+        // 订单折扣金额 = 电费折扣金额 + 服务费折扣金额
         BigDecimal discountAmount = electricityAmountDiscount.add(serviceAmountDiscount);
         orderBasicInfo.setDiscountAmount(discountAmount);
 
@@ -761,9 +761,9 @@ public abstract class AbstractProgramLogic implements InitializingBean {
         // 更新退款金额 = 支付金额 - 优惠后总消费金额
         BigDecimal refundAmount = orderBasicInfo.getPayAmount().subtract(totalConsumeAmount).setScale(2, RoundingMode.DOWN);
         orderBasicInfo.setRefundAmount(refundAmount);
-        // 电费折扣金额
+        // 电费折扣金额(电费便宜了多少钱)
         orderDetail.setDiscountElectricityAmount(electricityAmountDiscount);
-        // 服务费折扣金额
+        // 服务费折扣金额(服务费便宜了多少钱)
         orderDetail.setDiscountServiceAmount(serviceAmountDiscount);
         logger.info("计算订单折扣, orderCode:{}, memberId:{}, 订单折扣金额:{}, 电费折扣金额:{}, 服务费折扣金额:{}, 优惠后总消费金额:{}",
                 orderBasicInfo.getOrderCode(), memberId, discountAmount, electricityAmountDiscount, serviceAmountDiscount, totalConsumeAmount);