From 7ae6e4d6eba358b3cf0fce9f0c6bbee49224c8a2 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 14 一月 2025 17:56:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/WithdrawalRequestsServiceImpl.java |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/WithdrawalRequestsServiceImpl.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/WithdrawalRequestsServiceImpl.java
index 8c63510..94ee314 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/WithdrawalRequestsServiceImpl.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/WithdrawalRequestsServiceImpl.java
@@ -78,8 +78,7 @@
                 .divide(VIP_WITHDRAWAL_FEE_DENOMINATOR, 2, RoundingMode.HALF_UP);
         // 减去手续费
         BigDecimal multiply = params.getWithdrawalAmount().multiply(vipWithdrawalFee);
-        params.setWithdrawalAmount(params.getWithdrawalAmount()
-                .subtract(multiply));
+        params.setWithdrawalAmount(params.getWithdrawalAmount().subtract(multiply));
 
         WithdrawalRequests withdrawalRequests = new WithdrawalRequests();
         BeanUtils.copyBeanProp(withdrawalRequests, params);
@@ -92,7 +91,7 @@
             withdrawalRequests.setBankCardNumber(appUserBank.getBankNumber());
         }
         withdrawalRequests.setWithdrawalAmount(withdrawalAmount);
-        withdrawalRequests.setArrivalAmount(withdrawalRequests.getWithdrawalAmount());
+        withdrawalRequests.setArrivalAmount(params.getWithdrawalAmount());
         withdrawalRequests.setServiceCharge(multiply);
         withdrawalRequests.setDelFlag(0);
         withdrawalRequests.setAppUserId(SecurityUtils.getUserId());

--
Gitblit v1.7.1