From aa63cecb632d98323ea726e4159405d545430e40 Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Tue, 8 Oct 2024 09:59:40 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E7=94=B5=E5=8D=95=E8=BD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pile/domain/ebike/deviceupload/EBikeMessageCmd03.java | 3 +++
 .../service/programlogic/DelayMerchantProgramLogic.java   | 8 ++++++++
 2 files changed, 11 insertions(+)

diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/ebike/deviceupload/EBikeMessageCmd03.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ebike/deviceupload/EBikeMessageCmd03.java
index e9895e3c3..665f10824 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/ebike/deviceupload/EBikeMessageCmd03.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ebike/deviceupload/EBikeMessageCmd03.java
@@ -9,6 +9,9 @@ import lombok.ToString;
 
 import java.math.BigDecimal;
 
+/**
+ * 结算消费信息上传（03指令）
+ */
 @Getter
 @Setter
 @ToString(callSuper = true)
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 d16829707..f77b3b204 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
@@ -527,6 +527,13 @@ public class DelayMerchantProgramLogic extends AbstractProgramLogic {
             refundOrder(orderBasicInfo);
         }
 
+        // 退款金额
+        BigDecimal refundAmount = orderBasicInfo.getRefundAmount() == null ? BigDecimal.ZERO : orderBasicInfo.getRefundAmount();
+
+        // 结算金额 = 支付金额 - 退款金额
+        BigDecimal settleAmount = orderBasicInfo.getPayAmount().subtract(refundAmount).setScale(2, RoundingMode.DOWN);
+        orderBasicInfo.setSettleAmount(settleAmount);
+
         // 更新数据库
         OrderTransactionDTO dto = new OrderTransactionDTO();
         dto.setOrderBasicInfo(orderBasicInfo);
@@ -557,6 +564,7 @@ public class DelayMerchantProgramLogic extends AbstractProgramLogic {
         // 更新退款金额 = 支付金额 - 优惠后总消费金额
         BigDecimal refundAmount = orderBasicInfo.getPayAmount().subtract(consumeAmount).setScale(2, RoundingMode.DOWN);
         orderBasicInfo.setRefundAmount(refundAmount);
+
     }
 
     /**