ziin/keyboard_admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(tenantbalance): 修正提现校验逻辑为可提现金额

Browse Source
This commit is contained in:
ziin
2026-01-06 19:27:47 +08:00
parent 299bc5e28b
commit d75a3e0212
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
keyboard-server/src/main/java/com/yolo/keyboard/service/tenantbalance/TenantBalanceServiceImpl.java
View File

@@ -243,18 +243,18 @@ public class TenantBalanceServiceImpl implements TenantBalanceService {
throw exception(TENANT_BALANCE_NOT_EXISTS); throw exception(TENANT_BALANCE_NOT_EXISTS);
} }
// 3. 校验可用余额是否充足（可用余额 = 余额 - 冻结金额） // 3. 校验可提现金额是否充足
BigDecimal withdrawAmount = withdrawReqVO.getAmount(); BigDecimal withdrawAmount = withdrawReqVO.getAmount();
BigDecimal frozenAmt = balance.getFrozenAmt() != null ? balance.getFrozenAmt() : BigDecimal.ZERO; BigDecimal withdrawableBalance = balance.getWithdrawableBalance() != null ? balance.getWithdrawableBalance() : BigDecimal.ZERO;
BigDecimal availableBalance = balance.getBalance().subtract(frozenAmt); if (withdrawableBalance.compareTo(withdrawAmount) < 0) {
if (availableBalance.compareTo(withdrawAmount) < 0) {
throw exception(TENANT_BALANCE_WITHDRAW_INSUFFICIENT); throw exception(TENANT_BALANCE_WITHDRAW_INSUFFICIENT);
} }
// 4. 扣减余额并增加冻结金额 // 4. 从可提现金额中扣减并增加冻结金额
BigDecimal newBalance = balance.getBalance().subtract(withdrawAmount); BigDecimal frozenAmt = balance.getFrozenAmt() != null ? balance.getFrozenAmt() : BigDecimal.ZERO;
BigDecimal newWithdrawableBalance = withdrawableBalance.subtract(withdrawAmount);
BigDecimal newFrozenAmt = frozenAmt.add(withdrawAmount); BigDecimal newFrozenAmt = frozenAmt.add(withdrawAmount);
balance.setBalance(newBalance); balance.setWithdrawableBalance(newWithdrawableBalance);
balance.setFrozenAmt(newFrozenAmt); balance.setFrozenAmt(newFrozenAmt);
int updateCount = tenantBalanceMapper.updateById(balance); int updateCount = tenantBalanceMapper.updateById(balance);
if (updateCount == 0) { if (updateCount == 0) {
@@ -269,7 +269,7 @@ public class TenantBalanceServiceImpl implements TenantBalanceService {
TenantBalanceTransactionDO transaction = TenantBalanceTransactionDO.builder() TenantBalanceTransactionDO transaction = TenantBalanceTransactionDO.builder()
.bizNo(bizNo) .bizNo(bizNo)
.points(withdrawAmount.negate()) // 冻结金额（负数表示冻结扣减） .points(withdrawAmount.negate()) // 冻结金额（负数表示冻结扣减）
.balance(newBalance) // 扣减后的余额 .balance(newWithdrawableBalance) // 扣减后的可提现余额
.tenantId(tenantId) .tenantId(tenantId)
.type("FREEZE") .type("FREEZE")
.description("提现冻结") .description("提现冻结")