From 9e3c6fa190b1c59b2178ae1823c994684a4d9df3 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期四, 24 十月 2024 14:20:03 +0800
Subject: [PATCH] fix:结算
---
src/main/java/com/mzl/flower/service/impl/wallet/WalletWithdrawRecordServiceImpl.java | 27 ++++++++++++++++++---------
1 files changed, 18 insertions(+), 9 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 f2653ae..3292bd0 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
@@ -167,18 +167,22 @@
@Override
public void updateWallet(WalletWithdrawRecordDTO walletWithdrawRecordDTO) {
+
WalletWithdrawRecordDO withdrawRecordDO = walletWithdrawRecordMapper.selectById(walletWithdrawRecordDTO.getId());
if (withdrawRecordDO == null) {
throw new ValidationException("提现记录信息不存在");
}
+
if (StringUtils.isEmpty(walletWithdrawRecordDTO.getApproveState())) {
throw new ValidationException("审批状态不能为空");
}
+
if (Constants.WALLET_APPROVE_STATE.REJECT.name().equals(walletWithdrawRecordDTO.getApproveState())) {
- if(StringUtils.isEmpty(walletWithdrawRecordDTO.getRejectReason())){
- throw new ValidationException("不通过理由不能为空");
- }
+ if (StringUtils.isEmpty(walletWithdrawRecordDTO.getRejectReason())) {
+ throw new ValidationException("不通过理由不能为空");
+ }
}
+
BeanUtils.copyProperties(walletWithdrawRecordDTO, withdrawRecordDO);
withdrawRecordDO.update(SecurityUtils.getUserId());
withdrawRecordDO.setApproveState(walletWithdrawRecordDTO.getApproveState());
@@ -187,16 +191,18 @@
walletWithdrawRecordMapper.updateById(withdrawRecordDO);
//审批通过之后写转账信息
- if(Constants.WALLET_APPROVE_STATE.APPROVE.name().equals(walletWithdrawRecordDTO.getApproveState())){
+ if (Constants.WALLET_APPROVE_STATE.APPROVE.name().equals(walletWithdrawRecordDTO.getApproveState())) {
Supplier s = supplierMapper.selectById(withdrawRecordDO.getSupplierId());
String name = "";
name = "供应商" + s.getName();
UserWechat wechat = wechatMapper.selectOne(new QueryWrapper<UserWechat>().eq("user_id", s.getUserId()));
- if(wechat == null){
+
+ if (wechat == null) {
String msg = name + "未绑定账号无法结算";
log.error(msg);
throw new ValidationException(msg);
}
+
LocalDateTime now = LocalDateTime.now();
String day = format(now, "yyyy-MM-dd");
String remarks = name + "钱包提现";
@@ -208,14 +214,15 @@
transferReqDTO.setRemarks(remarks);
//保存账单信息
- WalletBillRecordDO walletBillRecordDO = new WalletBillRecordDO();
+ 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.setTransferId(transferReqDTO.getAppId());
//提现金额
- BigDecimal withdrawAmount = withdrawRecordDO.getAmount();
- if(withdrawAmount.doubleValue() > 0) {//结算金额>0时才去转账
+ BigDecimal withdrawAmount = withdrawRecordDO.getAmount();
+
+ if (withdrawAmount.doubleValue() > 0) {//结算金额>0时才去转账
TransferDetailReqDTO dr = new TransferDetailReqDTO();
dr.setId(UUIDGenerator.getUUID());
dr.setAmount(withdrawAmount.multiply(new BigDecimal(100)).longValue());
@@ -233,9 +240,11 @@
//发起转账
paymentV3Service.doBatchTransfer(transferReqDTO, SecurityUtils.getUserId());
}
+
+ //记录转账状态，定时任务定时获取状态并更新钱包交易记录表信息
+ walletBillRecordDO.setTransferDetailId(Constants.TRANSFER_STATUS.ACCEPTED.name());
walletBillRecordMapper.insert(walletBillRecordDO);
//不需要更新结算单了，此时提现的金额和计算单上的金额不一致
-
}
}
public String format(LocalDateTime dateTime, String format) {
--
Gitblit v1.9.3