From 6b68d921bcdb83ac4e33c521f0d5f8b4f6f18584 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期五, 08 十一月 2024 15:37:37 +0800
Subject: [PATCH] add:钱包功能调整1108
---
src/main/java/com/mzl/flower/service/impl/wallet/WalletWithdrawRecordServiceImpl.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 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 2e6110f..0fe7d36 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
@@ -269,6 +269,7 @@
if(ObjectUtils.isEmpty(walletBillRecordDO)){
throw new ValidationException("提现没有对应的账单信息");
}
+ walletBillRecordDO.setTransferId(transferReqDTO.getId());
//提现金额
BigDecimal withdrawAmount = withdrawRecordDO.getAmount();
@@ -289,7 +290,7 @@
transferReqDTO.setDetails(details);
try {
//发起转账
- paymentV3Service.doBatchTransfer(transferReqDTO, SecurityUtils.getUserId());
+ paymentV3Service.doBatchTransfer(transferReqDTO, SecurityUtils.getUserId());
} catch (Exception e) {
throw new ValidationException(e.getMessage());
}
@@ -298,9 +299,9 @@
//记录转账状态，定时任务定时获取状态并更新钱包交易记录表信息
walletBillRecordDO.setRemark("微信商户转账中");
walletBillRecordDO.setActualTransferAmount(withdrawAmount);
- walletBillRecordDO.setId(UUIDGenerator.getUUID());
- walletBillRecordService.updateById(walletBillRecordDO);
-// walletBillRecordMapper.insert(walletBillRecordDO);
+ walletBillRecordDO.setApproveBy(SecurityUtils.getUserId());
+ walletBillRecordDO.setApproveTime(LocalDateTime.now());
+ walletBillRecordMapper.updateById(walletBillRecordDO);
//不需要更新结算单了，此时提现的金额和计算单上的金额不一致
}
} finally {
@@ -344,6 +345,8 @@
walletBillRecordDO.create(SecurityUtils.getUserId());
walletBillRecordDO.setId(UUIDGenerator.getUUID());
walletBillRecordDO.setRemark("平台审核拒绝，余额返还钱包");
+ walletBillRecordDO.setApproveBy("sys");
+ walletBillRecordDO.setApproveTime(LocalDateTime.now());
// 保存账单明细
walletBillRecordService.save(walletBillRecordDO);
--
Gitblit v1.9.3