From 43af667f20a08bb25d1dbecf446c86ff694ae661 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A2=A8=E5=A4=A7=E5=8F=94?= <494979559@qq.com> Date: Thu, 1 Aug 2024 14:37:37 +0800 Subject: [PATCH] debug --- .../service/impl/TransactionBillServiceImpl.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/TransactionBillServiceImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/TransactionBillServiceImpl.java index 772ffd14..9bbf61e2 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/TransactionBillServiceImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/TransactionBillServiceImpl.java @@ -450,7 +450,8 @@ public class TransactionBillServiceImpl implements TransactionBillService { @Override public boolean passWithdraw(WithdrawApprovalDTO dto) { ServiceUtil.assertion(dto.getBillId() == null, "提现申请ID不允许为空"); - ServiceUtil.assertion(!redisLock.lock(RedisLockKey.APPROVAL_WITHDRAW, dto.getBillId()), "该提现申请正在审核，请刷新后重试"); + Long lockKey = dto.getBillId(); + ServiceUtil.assertion(!redisLock.lock(RedisLockKey.APPROVAL_WITHDRAW, lockKey), "该提现申请正在审核，请刷新后重试"); try { transactionTemplate.execute(status -> { int updateCount = this.approvalWithdraw(dto, TransactionBillStatus.WITHDRAW_PASSED); @@ -462,7 +463,7 @@ public class TransactionBillServiceImpl implements TransactionBillService { return true; } finally { - redisLock.unlock(RedisLockKey.APPROVAL_WITHDRAW, dto.toString()); + redisLock.unlock(RedisLockKey.APPROVAL_WITHDRAW, lockKey); } } @@ -486,7 +487,8 @@ public class TransactionBillServiceImpl implements TransactionBillService { @Override public boolean rejectWithdraw(WithdrawApprovalDTO dto) { ServiceUtil.assertion(dto.getBillId() == null, "提现申请ID不允许为空"); - ServiceUtil.assertion(!redisLock.lock(RedisLockKey.APPROVAL_WITHDRAW, dto.getBillId()), "该提现申请正在审核，请刷新后重试"); + Long lockKey = dto.getBillId(); + ServiceUtil.assertion(!redisLock.lock(RedisLockKey.APPROVAL_WITHDRAW, lockKey), "该提现申请正在审核，请刷新后重试"); try { transactionTemplate.execute(status -> { // 审核 @@ -503,7 +505,7 @@ public class TransactionBillServiceImpl implements TransactionBillService { return true; } finally { - redisLock.unlock(RedisLockKey.APPROVAL_WITHDRAW, dto.toString()); + redisLock.unlock(RedisLockKey.APPROVAL_WITHDRAW, lockKey); } }