From 520a6878cf6396625b70918593436bc824103eb4 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期五, 01 十一月 2024 13:19:54 +0800
Subject: [PATCH] fix: 钱包供应商财务2
---
src/main/java/com/mzl/flower/service/impl/wallet/WalletWithdrawRecordServiceImpl.java | 8 +++++---
1 files changed, 5 insertions(+), 3 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 b891ecf..7ed59d2 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
@@ -125,7 +125,7 @@
withdrawRecordDO.setBalance(walletDO.getWithdrawableAmount().subtract(dto.getAmount()));
withdrawRecordDO.setAmount(dto.getAmount());
withdrawRecordDO.setSupplierId(supplierDTO.getId());
- withdrawRecordDO.setWithdrawState(Constants.WALLET_WITHDRAW_STATE.WAITING.name());
+ withdrawRecordDO.setWithdrawState(Constants.BILL_WITHDRAW_TYPE.start.name());
withdrawRecordDO.setMethod(Constants.WALLET_WITHDRAW_METHOD.WEIXIN.name());
withdrawRecordDO.setWithdrawType(Constants.WALLET_WITHDRAW_TYPE.BALANCE.name());
// 待审核状态
@@ -188,6 +188,7 @@
public void updateWallet(WalletWithdrawRecordDTO walletWithdrawRecordDTO) {
WalletWithdrawRecordDO withdrawRecordDO = walletWithdrawRecordMapper.selectById(walletWithdrawRecordDTO.getId());
+ final String approveState = withdrawRecordDO.getApproveState();
if (withdrawRecordDO == null) {
throw new ValidationException("提现记录信息不存在");
}
@@ -209,7 +210,7 @@
withdrawRecordDO.setApproveTime(LocalDateTime.now());
if(Constants.WALLET_APPROVE_STATE.REJECT.name().equals(walletWithdrawRecordDTO.getApproveState())){
//如果拒绝直接提现失败
- withdrawRecordDO.setWithdrawState(Constants.WALLET_WITHDRAW_STATE.FAILURE.name());
+ withdrawRecordDO.setWithdrawState(Constants.BILL_WITHDRAW_TYPE.fail.name());
}
walletWithdrawRecordMapper.updateById(withdrawRecordDO);
@@ -219,7 +220,7 @@
try {
if (recordLock.tryLock(10, 30, TimeUnit.SECONDS)) {
try {
- if(!walletWithdrawRecordDTO.getApproveState().equals(Constants.WALLET_APPROVE_STATE.WAITING)){
+ if(!approveState.equals(Constants.WALLET_APPROVE_STATE.WAITING.name())){
String msg = "重复通过";
throw new ValidationException(msg);
}
@@ -254,6 +255,7 @@
WalletBillRecordDO walletBillRecordDO = new WalletBillRecordDO();
walletBillRecordDO.setSupplierId(s.getId());
walletBillRecordDO.setType(Constants.BILL_CHANGE_TYPE.withdraw.name());
+ walletBillRecordDO.setWithdrawType(Constants.BILL_WITHDRAW_TYPE.success.name());
walletBillRecordDO.setMethod(Constants.BILL_CHANGE_METHOD.reduce.name());
walletBillRecordDO.setTransferId(transferReqDTO.getId());
walletBillRecordDO.setWithdrawRecordId(withdrawRecordDO.getId());
--
Gitblit v1.9.3