From d19b094bde681e2a261ff28a088dd969b68ac65c Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期四, 24 十月 2024 15:26:40 +0800
Subject: [PATCH] fix:结算
---
src/main/java/com/mzl/flower/service/impl/wallet/WalletWithdrawRecordServiceImpl.java | 131 +++++++++++++++++++++++++++++++++++++------
1 files changed, 113 insertions(+), 18 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 68844de..b377744 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
@@ -7,10 +7,11 @@
import com.mzl.flower.config.exception.ValidationException;
import com.mzl.flower.config.security.SecurityUtils;
import com.mzl.flower.constant.Constants;
+import com.mzl.flower.constant.LockConstants;
import com.mzl.flower.dto.request.payment.TransferDetailReqDTO;
import com.mzl.flower.dto.request.payment.TransferReqDTO;
import com.mzl.flower.dto.request.wallet.CreateWalletWithdrawRecordDTO;
-import com.mzl.flower.dto.request.wallet.QueryWalletDTO;
+import com.mzl.flower.dto.request.wallet.QueryWalletWithdrawDTO;
import com.mzl.flower.dto.request.wallet.WalletWithdrawRecordDTO;
import com.mzl.flower.dto.response.supplier.SupplierDTO;
import com.mzl.flower.dto.response.wallet.WalletWithdrawRecordVO;
@@ -22,17 +23,23 @@
import com.mzl.flower.mapper.supplier.SupplierMapper;
import com.mzl.flower.mapper.system.UserWechatMapper;
import com.mzl.flower.mapper.wallet.WalletBillRecordMapper;
+import com.mzl.flower.mapper.wallet.WalletMapper;
import com.mzl.flower.mapper.wallet.WalletWithdrawRecordMapper;
import com.mzl.flower.service.payment.UserPaymentV3Service;
import com.mzl.flower.service.supplier.SupplierService;
+import com.mzl.flower.service.wallet.WalletBillRecordService;
import com.mzl.flower.service.wallet.WalletService;
import com.mzl.flower.service.wallet.WalletWithdrawRecordService;
import com.mzl.flower.utils.UUIDGenerator;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.redisson.api.RLock;
+import org.redisson.api.RedissonClient;
import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
import java.math.BigDecimal;
@@ -41,6 +48,7 @@
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.List;
+import java.util.concurrent.TimeUnit;
/**
* <p>
@@ -55,6 +63,7 @@
@Transactional
@RequiredArgsConstructor
public class WalletWithdrawRecordServiceImpl extends ServiceImpl<WalletWithdrawRecordMapper, WalletWithdrawRecordDO> implements WalletWithdrawRecordService {
+
private final WalletWithdrawRecordMapper walletWithdrawRecordMapper;
private final WalletService walletService;
private final SupplierService supplierService;
@@ -64,15 +73,24 @@
private final WalletBillRecordMapper walletBillRecordMapper;
+ private final WalletBillRecordService walletBillRecordService;
+
+ private final WalletMapper walletMapper;
+
+
+ @Autowired
+ RedissonClient redissonClient;
+
@Transactional
@Override
public boolean create(CreateWalletWithdrawRecordDTO dto) {
+
SupplierDTO supplierDTO = supplierService.getCurrentSupplier();
if (null == supplierDTO) {
throw new ValidationException("供应商不能为空");
}
- final WalletDO walletDO = walletService.getBySupplierId();
+ WalletDO walletDO = walletService.getCurrentSupplier();
if (null == walletDO) {
throw new ValidationException("钱包不能为空");
}
@@ -80,17 +98,72 @@
if (null != walletDO.getWithdrawableAmount() && null != dto.getAmount() && walletDO.getWithdrawableAmount().compareTo(dto.getAmount()) < 0) {
throw new ValidationException("钱包金额不足");
}
- WalletWithdrawRecordDO withdrawRecordDO = new WalletWithdrawRecordDO();
- withdrawRecordDO.setAmount(dto.getAmount());
- withdrawRecordDO.setSupplierId(supplierDTO.getId());
- withdrawRecordDO.setWithdrawState(Constants.WALLET_WITHDRAW_STATE.WAITING.name());
- withdrawRecordDO.setMethod(Constants.WALLET_WITHDRAW_METHOD.WEIXIN.name());
- withdrawRecordDO.create(SecurityUtils.getUserId());
- return save(withdrawRecordDO);
+
+ RLock lock = redissonClient.getLock(String.format(LockConstants.WALLET_ID_KEY, walletDO.getId()));
+ // 获取锁，最多等待 10 秒，锁自动释放时间 30 秒
+ try {
+ if (lock.tryLock(10, 30, TimeUnit.SECONDS)) {
+ try {
+
+ // 加锁了之后需要二次查询，防止未加锁之前 someone else 已经修改了
+ walletDO = walletService.getCurrentSupplier();
+ if (null == walletDO) {
+ throw new ValidationException("钱包不能为空");
+ }
+ // 查看钱包的金额是不是大于要提现的金额
+ if (null != walletDO.getWithdrawableAmount() && null != dto.getAmount() && walletDO.getWithdrawableAmount().compareTo(dto.getAmount()) < 0) {
+ throw new ValidationException("钱包金额不足");
+ }
+
+ // 1.新增一条余额提现记录
+ WalletWithdrawRecordDO withdrawRecordDO = new WalletWithdrawRecordDO();
+ withdrawRecordDO.setAmount(dto.getAmount());
+ withdrawRecordDO.setSupplierId(supplierDTO.getId());
+ withdrawRecordDO.setWithdrawState(Constants.WALLET_WITHDRAW_STATE.WAITING.name());
+ withdrawRecordDO.setMethod(Constants.WALLET_WITHDRAW_METHOD.WEIXIN.name());
+ withdrawRecordDO.create(SecurityUtils.getUserId());
+ // 保存余额提现记录
+ save(withdrawRecordDO);
+
+ /*
+ // 2.新增一条账单明细
+ WalletBillRecordDO walletBillRecordDO=new WalletBillRecordDO();
+ walletBillRecordDO.setSupplierId(supplierDTO.getId());
+ walletBillRecordDO.setWalletId(walletDO.getId());
+ // 提现
+ walletBillRecordDO.setType(Constants.BILL_CHANGE_TYPE.withdraw.name());
+ walletBillRecordDO.setMethod(Constants.BILL_CHANGE_METHOD.add.name());
+ walletBillRecordDO.setOriginalAmount(walletDO.getWithdrawableAmount());
+ walletBillRecordDO.setChangeAmount(dto.getAmount());
+ walletBillRecordDO.setBalance(walletDO.getWithdrawableAmount().subtract(dto.getAmount()));
+
+ // 保存账单明细
+ walletBillRecordService.save(walletBillRecordDO);
+*/
+
+ // 3. 钱包更新
+ // 钱包可提现的钱等于当前钱包可提现的钱-提现的钱
+ walletDO.setWithdrawableAmount(walletDO.getWithdrawableAmount().subtract(dto.getAmount()));
+ // 提现中的钱等于原有可提现的钱+提现的钱
+ walletDO.setWithdrawingAmount(walletDO.getWithdrawingAmount().add(dto.getAmount()));
+ walletDO.update(SecurityUtils.getUserId());
+
+ // 更新钱包
+ return walletService.updateById(walletDO);
+
+ } finally {
+ lock.unlock();
+ }
+ }
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+
+ return false;
}
@Override
- public Page<WalletWithdrawRecordVO> queryPage(QueryWalletDTO queryWalletDTO, Page page) {
+ public Page<WalletWithdrawRecordVO> queryPage(QueryWalletWithdrawDTO queryWalletDTO, Page page) {
List<WalletWithdrawRecordVO> list = walletWithdrawRecordMapper.queryPage(queryWalletDTO, page);
page.setRecords(list);
return page;
@@ -98,18 +171,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());
@@ -118,16 +195,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 + "钱包提现";
@@ -139,14 +218,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());
@@ -164,9 +244,24 @@
//发起转账
paymentV3Service.doBatchTransfer(transferReqDTO, SecurityUtils.getUserId());
}
+
+ //记录转账状态，定时任务定时获取状态并更新钱包交易记录表信息
+ walletBillRecordDO.setTransferDetailId(Constants.TRANSFER_STATUS.ACCEPTED.name());
walletBillRecordMapper.insert(walletBillRecordDO);
//不需要更新结算单了，此时提现的金额和计算单上的金额不一致
+ }
+ if (Constants.WALLET_APPROVE_STATE.REJECT.name().equals(walletWithdrawRecordDTO.getApproveState())) {
+ //更新钱包
+ Supplier s = supplierMapper.selectById(withdrawRecordDO.getSupplierId());
+ WalletDO walletDO = walletService.getBySupplierId(s.getId());
+ if(!ObjectUtils.isEmpty(walletDO)){
+ //提现中金额:审核失败体现中金额扣减
+ walletDO.setWithdrawingAmount(walletDO.getWithdrawingAmount().subtract(withdrawRecordDO.getAmount()));
+ //可提现金额:审核失败可提现金额增加
+ walletDO.setWithdrawableAmount(walletDO.getWithdrawableAmount().add(withdrawRecordDO.getAmount()));
+ walletMapper.updateById(walletDO);
+ }
}
}
public String format(LocalDateTime dateTime, String format) {
--
Gitblit v1.9.3