From 66f57ebef36c03353609ad3b2b6623396b5061a4 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期一, 28 十月 2024 15:06:54 +0800
Subject: [PATCH] 1.供应商-钱包创建并发控制

---
 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 e6dd65d..71a4ed5 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 @@
         if (Constants.WALLET_APPROVE_STATE.REJECT.name().equals(walletWithdrawRecordDTO.getApproveState())) {
             //更新钱包
             Supplier s = supplierMapper.selectById(withdrawRecordDO.getSupplierId());
-            WalletDO walletDO = walletService.getBySupplierId(s.getId());
+            WalletDO walletDO = walletService.getOrCreateBySupplierId(s.getId());
             if(!ObjectUtils.isEmpty(walletDO)){
                 //提现中金额:审核失败体现中金额扣减
                 walletDO.setWithdrawingAmount(walletDO.getWithdrawingAmount().subtract(withdrawRecordDO.getAmount()));

--
Gitblit v1.9.3