From 52081904dc467b81db0b28ff7cfed5979f14d1d2 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期五, 08 十一月 2024 19:52:04 +0800
Subject: [PATCH] add:钱包功能调整1108-2
---
src/main/java/com/mzl/flower/service/impl/wallet/WalletWithdrawRecordServiceImpl.java | 14 ++++++++++----
1 files changed, 10 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 d5b8fef..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
@@ -181,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;
@@ -269,6 +276,7 @@
if(ObjectUtils.isEmpty(walletBillRecordDO)){
throw new ValidationException("提现没有对应的账单信息");
}
+ walletBillRecordDO.setTransferId(transferReqDTO.getId());
//提现金额
BigDecimal withdrawAmount = withdrawRecordDO.getAmount();
@@ -289,7 +297,7 @@
transferReqDTO.setDetails(details);
try {
//发起转账
- paymentV3Service.doBatchTransfer(transferReqDTO, SecurityUtils.getUserId());
+ paymentV3Service.doBatchTransfer(transferReqDTO, SecurityUtils.getUserId());
} catch (Exception e) {
throw new ValidationException(e.getMessage());
}
@@ -298,11 +306,9 @@
//记录转账状态，定时任务定时获取状态并更新钱包交易记录表信息
walletBillRecordDO.setRemark("微信商户转账中");
walletBillRecordDO.setActualTransferAmount(withdrawAmount);
- walletBillRecordDO.setId(UUIDGenerator.getUUID());
walletBillRecordDO.setApproveBy(SecurityUtils.getUserId());
walletBillRecordDO.setApproveTime(LocalDateTime.now());
- walletBillRecordService.updateById(walletBillRecordDO);
-// walletBillRecordMapper.insert(walletBillRecordDO);
+ walletBillRecordMapper.updateById(walletBillRecordDO);
//不需要更新结算单了，此时提现的金额和计算单上的金额不一致
}
} finally {
--
Gitblit v1.9.3