From 889e5f608dfc153808199e0df9b02d0a41faae11 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 20 May 2025 18:19:06 +0800
Subject: [PATCH] refactor(mall): 调整退款金额计算逻辑

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java |    2 +-
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
index 0d9a167..f6c0cdd 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -1106,7 +1106,7 @@
                     mallRefundEntity.setType(3);
                 }
                 mallRefundEntity.setState(3);
-                mallRefundEntity.setAmount(mallOrderItem.getAmount());
+                mallRefundEntity.setAmount(mallOrderItem.getAmount().add(mallOrderInfo.getCarriage()));
                 mallRefundMapper.insert(mallRefundEntity);
             }else{
                 if(mallRefund.getState() == 1){
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java
index 1d98e94..ea691f2 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java
@@ -420,7 +420,7 @@
 
             //退款退款金额
             BigDecimal refundAmount = mallRefundEntity.getAmount();
-            refundAmount = refundAmount.add(mallOrderInfo.getCarriage());
+//            refundAmount = refundAmount.add(mallOrderInfo.getCarriage());
             BigDecimal bb = new BigDecimal(100);
             int refundMoney = refundAmount.multiply(bb).intValue();
 

--
Gitblit v1.9.1