From 37f3d16b75bb388d665c93ff0ed3945093df42bc Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期四, 07 十一月 2024 20:09:35 +0800
Subject: [PATCH] add:钱包功能调整
---
src/main/java/com/mzl/flower/service/impl/wallet/WalletBillRecordServiceImpl.java | 104 ++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 76 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/mzl/flower/service/impl/wallet/WalletBillRecordServiceImpl.java b/src/main/java/com/mzl/flower/service/impl/wallet/WalletBillRecordServiceImpl.java
index 902a138..948c25c 100644
--- a/src/main/java/com/mzl/flower/service/impl/wallet/WalletBillRecordServiceImpl.java
+++ b/src/main/java/com/mzl/flower/service/impl/wallet/WalletBillRecordServiceImpl.java
@@ -2,15 +2,14 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+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.wallet.CreateWalletBillRecordDTO;
import com.mzl.flower.dto.request.wallet.QueryWalletBillRecordDTO;
import com.mzl.flower.dto.response.wallet.WalletBillRecordVO;
import com.mzl.flower.dto.request.wallet.QueryWalletBillDTO;
-import com.mzl.flower.dto.response.wallet.WalletBillRecordVO;
import com.mzl.flower.entity.payment.Transfer;
import com.mzl.flower.entity.payment.TransferDetail;
import com.mzl.flower.entity.wallet.WalletBillRecordDO;
@@ -24,6 +23,7 @@
import com.mzl.flower.service.wallet.WalletBillRecordService;
import com.mzl.flower.service.wallet.WalletService;
import com.mzl.flower.utils.ExcelExportUtil;
+import com.mzl.flower.utils.UUIDGenerator;
import org.redisson.api.RLock;
import org.redisson.api.RedissonClient;
import org.springframework.stereotype.Service;
@@ -33,11 +33,11 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.TimeUnit;
-import java.util.List;
/**
* <p>
@@ -72,6 +72,9 @@
@Resource
RedissonClient redissonClient;
+ @Resource
+ WalletBillRecordService walletBillRecordService;
+
@Override
public void create(CreateWalletBillRecordDTO dto) {
@@ -95,32 +98,48 @@
if ("SUCCESS".equals(dStatus)) {
walletBillRecordDO.setTransferState(Constants.SETTLEMENT_STATUS.COMPLETED.name());
walletBillRecordDO.update("sys");
+ walletBillRecordDO.setRemark("微信商户转账成功");
walletBillRecordMapper.updateById(walletBillRecordDO);
//更新钱包
- WalletDO walletDO = walletService.getOrCreateBySupplierId(walletBillRecordDO.getWalletId());
- 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)) {
- //提现中金额:减少提现中金额
- walletDO.setWithdrawingAmount(walletDO.getWithdrawingAmount().subtract(walletBillRecordDO.getChangeAmount()));
- //已提现金额:增加已提现金额
- walletDO.setWithdrawnAmount(walletDO.getWithdrawnAmount().add(walletBillRecordDO.getChangeAmount()));
- walletMapper.updateById(walletDO);
- }
- } finally {
- lock.unlock();
- }
- }
- } catch (InterruptedException e) {
- throw new RuntimeException(e);
- }
+// WalletDO walletDO = walletService.getOrCreateBySupplierId(walletBillRecordDO.getWalletId());
+// 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)) {
+// WalletBillRecordDO walletBillRecordDO2 = new WalletBillRecordDO();
+// walletBillRecordDO2.setId(UUIDGenerator.getUUID());
+// walletBillRecordDO2.setSupplierId(walletDO.getSupplierId());
+// walletBillRecordDO2.setWalletId(walletDO.getId());
+// walletBillRecordDO2.setType(Constants.BILL_CHANGE_TYPE.withdraw.name());
+// // 发起提现
+// walletBillRecordDO2.setWithdrawType(Constants.BILL_WITHDRAW_TYPE.success.name());
+// walletBillRecordDO2.setMethod(Constants.BILL_CHANGE_METHOD.reduce.name());
+// walletBillRecordDO2.setOriginalAmount(walletDO.getWithdrawableAmount());
+// walletBillRecordDO2.setChangeAmount(BigDecimal.ZERO);
+// walletBillRecordDO2.setBalance(walletDO.getWithdrawableAmount());
+// walletBillRecordDO2.create(SecurityUtils.getUserId());
+// walletBillRecordDO.setId(UUIDGenerator.getUUID());
+// // 保存账单明细
+// walletBillRecordService.save(walletBillRecordDO);
+// //提现中金额:减少提现中金额
+// walletDO.setWithdrawingAmount(walletDO.getWithdrawingAmount().subtract(walletBillRecordDO.getChangeAmount()));
+// //已提现金额:增加已提现金额
+// walletDO.setWithdrawnAmount(walletDO.getWithdrawnAmount().add(walletBillRecordDO.getChangeAmount()));
+// walletMapper.updateById(walletDO);
+// }
+// } finally {
+// lock.unlock();
+// }
+// }
+// } catch (InterruptedException e) {
+// throw new RuntimeException(e);
+// }
//回写提现状态
if (StringUtils.isEmpty(walletBillRecordDO.getWithdrawRecordId())) {
WalletWithdrawRecordDO withdrawRecordDO = walletWithdrawRecordMapper.selectById(walletBillRecordDO.getWithdrawRecordId());
- withdrawRecordDO.setWithdrawState(Constants.WALLET_WITHDRAW_STATE.SUCCESS.name());
- walletBillRecordDO.setRemark("账户资金提现完成");
+ withdrawRecordDO.setWithdrawState(Constants.BILL_WITHDRAW_TYPE.success.name());
+ walletBillRecordDO.setRemark("微信商户转账成功");
walletWithdrawRecordMapper.updateById(withdrawRecordDO);
}
@@ -134,10 +153,27 @@
if (lock.tryLock(10, 30, TimeUnit.SECONDS)) {
try {
if (!ObjectUtils.isEmpty(walletDO)) {
+ // 2.新增一条账单明细
+ WalletBillRecordDO walletBillRecordDO2 = new WalletBillRecordDO();
+ walletBillRecordDO2.setId(UUIDGenerator.getUUID());
+ walletBillRecordDO2.setSupplierId(walletDO.getSupplierId());
+ walletBillRecordDO2.setWalletId(walletDO.getId());
+ walletBillRecordDO2.setType(Constants.BILL_CHANGE_TYPE.withdraw.name());
+ // 发起提现
+ walletBillRecordDO2.setWithdrawType(Constants.BILL_WITHDRAW_TYPE.fail.name());
+ walletBillRecordDO2.setMethod(Constants.BILL_CHANGE_METHOD.add.name());
+ walletBillRecordDO2.setOriginalAmount(walletDO.getWithdrawableAmount());
+ walletBillRecordDO2.setChangeAmount(walletBillRecordDO.getActualTransferAmount());
+ walletBillRecordDO2.setBalance(walletDO.getWithdrawableAmount().add(walletBillRecordDO.getActualTransferAmount()));
+ walletBillRecordDO2.create(SecurityUtils.getUserId());
+ walletBillRecordDO.setId(UUIDGenerator.getUUID());
+ walletBillRecordDO.setRemark("微信商户转账失败，余额返还钱包");
+ // 保存账单明细
+ walletBillRecordService.save(walletBillRecordDO);
//提现中金额:减少提现中金额
- walletDO.setWithdrawingAmount(walletDO.getWithdrawingAmount().subtract(walletBillRecordDO.getChangeAmount()));
+ walletDO.setWithdrawingAmount(walletDO.getWithdrawingAmount().subtract(walletBillRecordDO.getActualTransferAmount()));
//可提现金额:增加可提现金额
- walletDO.setWithdrawableAmount(walletDO.getWithdrawableAmount().add(walletBillRecordDO.getChangeAmount()));
+ walletDO.setWithdrawableAmount(walletDO.getWithdrawableAmount().add(walletBillRecordDO.getActualTransferAmount()));
walletMapper.updateById(walletDO);
}
} finally {
@@ -150,8 +186,8 @@
//回写提现状态
if (StringUtils.isEmpty(walletBillRecordDO.getWithdrawRecordId())) {
WalletWithdrawRecordDO withdrawRecordDO = walletWithdrawRecordMapper.selectById(walletBillRecordDO.getWithdrawRecordId());
- withdrawRecordDO.setWithdrawState(Constants.WALLET_WITHDRAW_STATE.FAILURE.name());
- walletBillRecordDO.setRemark("账户资金提现失败");
+ withdrawRecordDO.setWithdrawState(Constants.BILL_WITHDRAW_TYPE.fail.name());
+ walletBillRecordDO.setRemark("微信商户转账失败，余额返还钱包");
walletWithdrawRecordMapper.updateById(withdrawRecordDO);
}
}
@@ -204,4 +240,16 @@
page.setRecords(list);
return page;
}
+
+ @Override
+ public Page<WalletBillRecordVO> getPageByDesc(Page page, QueryWalletBillDTO dto) {
+ List<WalletBillRecordVO> list = walletBillRecordMapper.getPageByDesc(page,dto);
+ page.setRecords(list);
+ return page;
+ }
+
+ @Override
+ public WalletBillRecordDO getBillRecordByWithdrawRecordId(Long withdrawRecordId) {
+ return walletBillRecordMapper.getBillRecordByWithdrawRecordId(withdrawRecordId);
+ }
}
--
Gitblit v1.9.3