From 71edec48f789e505546b59fce9b91442e91327cc Mon Sep 17 00:00:00 2001
From: wangzhiwei <wangzhiwei@kexue.art>
Date: Sat, 11 Apr 2026 21:49:55 +0800
Subject: [PATCH] =?UTF-8?q?fix(account):=20=E4=BF=AE=E5=A4=8D=E8=B4=A6?=
 =?UTF-8?q?=E6=88=B7=E4=BD=99=E9=A2=9D=E8=AE=A1=E7=AE=97=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除实际扣减小于预扣减时的余额调整逻辑
- 删除最终扣减为0时预扣减加回余额的处理
- 简化账户余额更新流程，避免重复计算
---
 .../skills/service/impl/AccountFrozenServiceImpl.java    | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/main/java/com/kexue/skills/service/impl/AccountFrozenServiceImpl.java b/src/main/java/com/kexue/skills/service/impl/AccountFrozenServiceImpl.java
index d613049..38c104d 100644
--- a/src/main/java/com/kexue/skills/service/impl/AccountFrozenServiceImpl.java
+++ b/src/main/java/com/kexue/skills/service/impl/AccountFrozenServiceImpl.java
@@ -234,16 +234,7 @@ public class AccountFrozenServiceImpl implements AccountFrozenService {
                 } else {
                     account.setBalance(balance.subtract(finalAmount));
                 }
-                
-                // 实际扣减小于预扣减，将剩余预扣减加回balance
-                if (finalAmount.compareTo(accountFrozen.getFrozenAmount()) < 0) {
-                    BigDecimal remainingFrozen = accountFrozen.getFrozenAmount().subtract(finalAmount);
-                    account.setBalance(account.getBalance().add(remainingFrozen));
-                }
             }
-        } else {
-            // 最终扣减为0，将预扣减全部加回balance
-            account.setBalance(balance.add(accountFrozen.getFrozenAmount()));
         }
 
         account.setUpdateTime(new Date());