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 | 196 ++++++++++++++++++++++++++++++++++++------------
1 files changed, 145 insertions(+), 51 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 46ccee8..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());
// 待审核状态
@@ -135,6 +135,27 @@
// 保存余额提现记录
save(withdrawRecordDO);
+
+
+ // 2.新增一条账单明细
+ WalletBillRecordDO walletBillRecordDO=new WalletBillRecordDO();
+ walletBillRecordDO.setId(UUIDGenerator.getUUID());
+ walletBillRecordDO.setSupplierId(supplierDTO.getId());
+ walletBillRecordDO.setWalletId(walletDO.getId());
+ walletBillRecordDO.setType(Constants.BILL_CHANGE_TYPE.withdraw.name());
+ // 发起提现
+ walletBillRecordDO.setWithdrawType(Constants.BILL_WITHDRAW_TYPE.start.name());
+ walletBillRecordDO.setMethod(Constants.BILL_CHANGE_METHOD.reduce.name());
+ walletBillRecordDO.setOriginalAmount(walletDO.getWithdrawableAmount());
+ walletBillRecordDO.setChangeAmount(dto.getAmount());
+ walletBillRecordDO.setBalance(walletDO.getWithdrawableAmount().subtract(dto.getAmount()));
+ walletBillRecordDO.create(SecurityUtils.getUserId());
+ walletBillRecordDO.setWithdrawRecordId(withdrawRecordDO.getId());
+ walletBillRecordDO.setRemark("提现中");
+
+ // 保存账单明细
+ walletBillRecordService.save(walletBillRecordDO);
+
// 3. 钱包更新
@@ -160,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;
@@ -169,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("提现记录信息不存在");
}
@@ -190,67 +219,112 @@
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);
//审批通过之后写转账信息
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()));
+ RLock recordLock = redissonClient.getLock(String.format(LockConstants.WALLET_WITHDRAW_RECORD_KEY, walletWithdrawRecordDTO.getId()));
+ try {
+ if (recordLock.tryLock(10, 30, TimeUnit.SECONDS)) {
+ try {
+ if(!approveState.equals(Constants.WALLET_APPROVE_STATE.WAITING.name())){
+ String msg = "重复通过";
+ throw new ValidationException(msg);
+ }
+ Supplier s = supplierMapper.selectById(withdrawRecordDO.getSupplierId());
+ WalletDO walletDO = walletService.getOrCreateBySupplierId(s.getId());
+ RLock lock = redissonClient.getLock(String.format(LockConstants.WALLET_ID_KEY, walletDO.getId()));
+ try {
+ if (lock.tryLock(10, 30, TimeUnit.SECONDS)) {
+ try {
+ if (!ObjectUtils.isEmpty(walletDO)) {
+ String name = "";
+ name = "供应商" + s.getName();
+ UserWechat wechat = wechatMapper.selectOne(new QueryWrapper<UserWechat>().eq("user_id", s.getUserId()));
- if (wechat == null) {
- String msg = name + "未绑定账号无法提现";
- log.error(msg);
- throw new ValidationException(msg);
- }
+ 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 + "钱包提现";
- String appId = PyamentV3Configurer.supplier_app_id;
- TransferReqDTO transferReqDTO = new TransferReqDTO();
- transferReqDTO.setId(UUIDGenerator.getUUID());
- transferReqDTO.setAppId(appId);
- transferReqDTO.setName(day + "日" + remarks);
- transferReqDTO.setRemarks(remarks);
+ LocalDateTime now = LocalDateTime.now();
+ String day = format(now, "yyyy-MM-dd");
+ String remarks = name + "钱包提现";
+ String appId = PyamentV3Configurer.supplier_app_id;
+ TransferReqDTO transferReqDTO = new TransferReqDTO();
+ transferReqDTO.setId(UUIDGenerator.getUUID());
+ transferReqDTO.setAppId(appId);
+ transferReqDTO.setName(day + "日" + remarks);
+ 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.setTransferId(transferReqDTO.getId());
- walletBillRecordDO.setWithdrawRecordId(withdrawRecordDO.getId());
- walletBillRecordDO.create();
- //提现金额
- BigDecimal withdrawAmount = withdrawRecordDO.getAmount();
+ //保存账单信息
+// 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());
+ //提现金额
+ 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());
- dr.setOpenId(wechat.getOpenId());
- dr.setRemarks(remarks);
- if (withdrawAmount.doubleValue() >= 2000) {
- dr.setUserName(wechat.getRealName());
+ if (withdrawAmount.doubleValue() > 0) {//结算金额>0时才去转账
+ TransferDetailReqDTO dr = new TransferDetailReqDTO();
+ dr.setId(UUIDGenerator.getUUID());
+ dr.setAmount(withdrawAmount.multiply(new BigDecimal(100)).longValue());
+ dr.setOpenId(wechat.getOpenId());
+ dr.setRemarks(remarks);
+ if (withdrawAmount.doubleValue() >= 2000) {
+ dr.setUserName(wechat.getRealName());
+ }
+
+ List<TransferDetailReqDTO> details = new ArrayList<>();
+ details.add(dr);
+ walletBillRecordDO.setTransferDetailId(dr.getId());
+ log.info("发起转账");
+ transferReqDTO.setDetails(details);
+ try {
+ //发起转账
+ paymentV3Service.doBatchTransfer(transferReqDTO, SecurityUtils.getUserId());
+ } catch (Exception e) {
+ throw new ValidationException(e.getMessage());
+ }
+ }
+
+ //记录转账状态，定时任务定时获取状态并更新钱包交易记录表信息
+ walletBillRecordDO.setRemark("微信商户转账中");
+ walletBillRecordDO.setActualTransferAmount(withdrawAmount);
+ walletBillRecordDO.setApproveBy(SecurityUtils.getUserId());
+ walletBillRecordDO.setApproveTime(LocalDateTime.now());
+ walletBillRecordMapper.updateById(walletBillRecordDO);
+ //不需要更新结算单了，此时提现的金额和计算单上的金额不一致
+ }
+ } finally {
+ lock.unlock();
+ }
+ }
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+ } finally {
+ recordLock.unlock();
+ }
}
-
- List<TransferDetailReqDTO> details = new ArrayList<>();
- details.add(dr);
- walletBillRecordDO.setTransferDetailId(dr.getId());
- log.info("发起转账");
- transferReqDTO.setDetails(details);
- //发起转账
- paymentV3Service.doBatchTransfer(transferReqDTO, SecurityUtils.getUserId());
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
}
-
- //记录转账状态，定时任务定时获取状态并更新钱包交易记录表信息
- walletBillRecordDO.setRemark("账户资金提现中");
- walletBillRecordMapper.insert(walletBillRecordDO);
- //不需要更新结算单了，此时提现的金额和计算单上的金额不一致
}
if (Constants.WALLET_APPROVE_STATE.REJECT.name().equals(walletWithdrawRecordDTO.getApproveState())) {
@@ -263,6 +337,26 @@
if (lock.tryLock(10, 30, TimeUnit.SECONDS)) {
try {
if (!ObjectUtils.isEmpty(walletDO)) {
+ // 2.新增一条账单明细
+ WalletBillRecordDO walletBillRecordDO = new WalletBillRecordDO();
+ walletBillRecordDO.setId(UUIDGenerator.getUUID());
+ walletBillRecordDO.setSupplierId(walletDO.getSupplierId());
+ walletBillRecordDO.setWalletId(walletDO.getId());
+ walletBillRecordDO.setType(Constants.BILL_CHANGE_TYPE.withdraw.name());
+ // 发起提现
+ walletBillRecordDO.setWithdrawType(Constants.BILL_WITHDRAW_TYPE.fail.name());
+ walletBillRecordDO.setMethod(Constants.BILL_CHANGE_METHOD.add.name());
+ walletBillRecordDO.setOriginalAmount(walletDO.getWithdrawableAmount());
+ walletBillRecordDO.setChangeAmount(withdrawRecordDO.getAmount());
+ 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);
+
//提现中金额:审核失败体现中金额扣减
walletDO.setWithdrawingAmount(walletDO.getWithdrawingAmount().subtract(withdrawRecordDO.getAmount()));
//可提现金额:审核失败可提现金额增加
--
Gitblit v1.9.3