From 617cac9aab814b33a4a0947d7222eae1098028ca Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期一, 28 十月 2024 16:33:52 +0800
Subject: [PATCH] Merge branch 'master-v4' of http://47.96.225.205:8888/r/flowerbackend-v2 into master-v4
---
src/main/java/com/mzl/flower/service/impl/wallet/WalletWithdrawRecordServiceImpl.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/mzl/flower/service/impl/wallet/WalletWithdrawRecordServiceImpl.java b/src/main/java/com/mzl/flower/service/impl/wallet/WalletWithdrawRecordServiceImpl.java
index 9a6fbbe..3d02608 100644
--- a/src/main/java/com/mzl/flower/service/impl/wallet/WalletWithdrawRecordServiceImpl.java
+++ b/src/main/java/com/mzl/flower/service/impl/wallet/WalletWithdrawRecordServiceImpl.java
@@ -117,6 +117,12 @@
// 1.新增一条余额提现记录
WalletWithdrawRecordDO withdrawRecordDO = new WalletWithdrawRecordDO();
+ //原金额
+ withdrawRecordDO.setOriginalAmount(walletDO.getWithdrawableAmount());
+ // 变动金额
+ withdrawRecordDO.setChangeAmount(dto.getAmount());
+ // 余额
+ withdrawRecordDO.setBalance(walletDO.getWithdrawableAmount().subtract(dto.getAmount()));
withdrawRecordDO.setAmount(dto.getAmount());
withdrawRecordDO.setSupplierId(supplierDTO.getId());
withdrawRecordDO.setWithdrawState(Constants.WALLET_WITHDRAW_STATE.WAITING.name());
@@ -246,7 +252,7 @@
//更新钱包
Supplier s = supplierMapper.selectById(withdrawRecordDO.getSupplierId());
- WalletDO walletDO = walletService.getBySupplierId(s.getId());
+ WalletDO walletDO = walletService.getOrCreateBySupplierId(s.getId());
RLock lock = redissonClient.getLock(String.format(LockConstants.WALLET_ID_KEY, walletDO.getId()));
try {
if (lock.tryLock(10, 30, TimeUnit.SECONDS)) {
--
Gitblit v1.9.3