From 6c823dd44dbde79f008001a2a11e7bf9bc6bf8cc Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期三, 04 十二月 2024 18:15:44 +0800
Subject: [PATCH] fix:合伙人列表操作日志
---
src/main/java/com/mzl/flower/service/impl/wallet/WalletWithdrawRecordServiceImpl.java | 52 ++++++++++++++++++++++++++++++++++++----------------
1 files changed, 36 insertions(+), 16 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..1b6b228 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());
// 待审核状态
@@ -150,6 +150,8 @@
walletBillRecordDO.setChangeAmount(dto.getAmount());
walletBillRecordDO.setBalance(walletDO.getWithdrawableAmount().subtract(dto.getAmount()));
walletBillRecordDO.create(SecurityUtils.getUserId());
+ walletBillRecordDO.setWithdrawRecordId(withdrawRecordDO.getId());
+ walletBillRecordDO.setRemark("提现中");
// 保存账单明细
walletBillRecordService.save(walletBillRecordDO);
@@ -179,6 +181,13 @@
@Override
public Page<WalletWithdrawRecordVO> queryPage(QueryWalletWithdrawDTO queryWalletDTO, Page page) {
+ try {
+ if (!StringUtils.isEmpty(queryWalletDTO.getSupplierId())) {
+ Long supplierId = Long.parseLong(queryWalletDTO.getSupplierId());
+ }
+ } catch (Exception e) {
+ throw new ValidationException("供应商ID格式不正确");
+ }
List<WalletWithdrawRecordVO> list = walletWithdrawRecordMapper.queryPage(queryWalletDTO, page);
page.setRecords(list);
return page;
@@ -188,6 +197,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 +219,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 +229,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);
}
@@ -251,16 +261,22 @@
transferReqDTO.setRemarks(remarks);
//保存账单信息
- WalletBillRecordDO walletBillRecordDO = new WalletBillRecordDO();
- walletBillRecordDO.setSupplierId(s.getId());
- walletBillRecordDO.setType(Constants.BILL_CHANGE_TYPE.withdraw.name());
- walletBillRecordDO.setMethod(Constants.BILL_CHANGE_METHOD.reduce.name());
+// 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());
+// walletBillRecordDO.create();
+// walletBillRecordDO.setOriginalAmount(walletDO.getWithdrawableAmount());
+// walletBillRecordDO.setChangeAmount(BigDecimal.ZERO);
+// walletBillRecordDO.setBalance(walletDO.getWithdrawableAmount());
+ WalletBillRecordDO walletBillRecordDO = walletBillRecordService.getBillRecordByWithdrawRecordId(withdrawRecordDO.getId());
+ if(ObjectUtils.isEmpty(walletBillRecordDO)){
+ throw new ValidationException("提现没有对应的账单信息");
+ }
walletBillRecordDO.setTransferId(transferReqDTO.getId());
- walletBillRecordDO.setWithdrawRecordId(withdrawRecordDO.getId());
- walletBillRecordDO.create();
- walletBillRecordDO.setOriginalAmount(walletDO.getWithdrawableAmount());
- walletBillRecordDO.setChangeAmount(BigDecimal.ZERO);
- walletBillRecordDO.setBalance(walletDO.getWithdrawableAmount());
//提现金额
BigDecimal withdrawAmount = withdrawRecordDO.getAmount();
@@ -281,17 +297,18 @@
transferReqDTO.setDetails(details);
try {
//发起转账
- // paymentV3Service.doBatchTransfer(transferReqDTO, SecurityUtils.getUserId());
+ paymentV3Service.doBatchTransfer(transferReqDTO, SecurityUtils.getUserId());
} catch (Exception e) {
throw new ValidationException(e.getMessage());
}
}
//记录转账状态，定时任务定时获取状态并更新钱包交易记录表信息
- walletBillRecordDO.setRemark("账户资金提现中");
+ walletBillRecordDO.setRemark("微信商户转账中");
walletBillRecordDO.setActualTransferAmount(withdrawAmount);
- walletBillRecordDO.setId(UUIDGenerator.getUUID());
- walletBillRecordMapper.insert(walletBillRecordDO);
+ walletBillRecordDO.setApproveBy(SecurityUtils.getUserId());
+ walletBillRecordDO.setApproveTime(LocalDateTime.now());
+ walletBillRecordMapper.updateById(walletBillRecordDO);
//不需要更新结算单了，此时提现的金额和计算单上的金额不一致
}
} finally {
@@ -334,6 +351,9 @@
walletBillRecordDO.setBalance(walletDO.getWithdrawableAmount().add(withdrawRecordDO.getAmount()));
walletBillRecordDO.create(SecurityUtils.getUserId());
walletBillRecordDO.setId(UUIDGenerator.getUUID());
+ walletBillRecordDO.setRemark("平台审核拒绝，余额返还钱包");
+ walletBillRecordDO.setApproveBy("sys");
+ walletBillRecordDO.setApproveTime(LocalDateTime.now());
// 保存账单明细
walletBillRecordService.save(walletBillRecordDO);
--
Gitblit v1.9.3