From 5fc11ac45dc778cd7f178e96ab0c46dcf331760f Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Wed, 26 Mar 2025 19:26:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BB=93=E7=AE=97=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/jsowell/service/TempService.java       | 5 +++++
 .../pile/service/programlogic/AbstractProgramLogic.java      | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/jsowell-admin/src/main/java/com/jsowell/service/TempService.java b/jsowell-admin/src/main/java/com/jsowell/service/TempService.java
index 6bd0ff59a..ca8b1ee25 100644
--- a/jsowell-admin/src/main/java/com/jsowell/service/TempService.java
+++ b/jsowell-admin/src/main/java/com/jsowell/service/TempService.java
@@ -892,10 +892,15 @@ public class TempService {
 
         // 查询订单详情
         OrderDetail orderDetail = orderBasicInfoService.getOrderDetailByOrderCode(orderBasicInfo.getOrderCode());
+
         programLogic.updateOrderBasicInfoAndOrderDetail(data, orderBasicInfo, orderDetail);
 
         // 计算订单折扣
         programLogic.calculateOrderDiscountsV2(orderBasicInfo, orderDetail);
+
+        logger.info("testSettleOrderLogic, orderCode:{}, 支付金额:{}, 消费金额:{}, 折扣金额:{}, 退款金额:{}, 结算金额:{}",
+                orderBasicInfo.getOrderCode(), orderBasicInfo.getPayAmount(), orderBasicInfo.getOrderAmount(),
+                orderBasicInfo.getDiscountAmount(), orderBasicInfo.getRefundAmount(), orderBasicInfo.getSettleAmount());
     }
 }
 
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 d3a0d424d..77cefdf19 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
@@ -927,8 +927,8 @@ public abstract class AbstractProgramLogic implements InitializingBean {
         MemberDiscountVO memberDiscountVO = memberGroupService.queryMemberDiscountV2(merchantId, stationId, memberId);
         if (memberDiscountVO == null) {
             // 如果没有优惠，则优惠后金额 等于优惠前金额
-            afterDiscountServiceAmount = orderDetail.getTotalServiceAmount();
             afterDiscountElectricityAmount = orderDetail.getTotalElectricityAmount();
+            afterDiscountServiceAmount = orderDetail.getTotalServiceAmount();
         } else {
             // 集团会员的订单，记录集团编号
             orderBasicInfo.setGroupCode(memberDiscountVO.getGroupCode());