From ae1471f378f399f76518539ec8992e64a3673436 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期三, 08 一月 2025 15:26:06 +0800
Subject: [PATCH] 1.订单提交：订单最小金额配置
---
src/main/java/com/mzl/flower/service/impl/wallet/WalletBillRecordServiceImpl.java | 81 +++++++++++++++++++++++++++++++++-------
1 files changed, 67 insertions(+), 14 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 455e4c9..f3a17c7 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,15 @@
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.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.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,9 +24,9 @@
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.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
@@ -34,11 +34,12 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
import java.net.URLEncoder;
+import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.TimeUnit;
-import java.util.List;
/**
* <p>
@@ -73,6 +74,9 @@
@Resource
RedissonClient redissonClient;
+ @Resource
+ WalletBillRecordService walletBillRecordService;
+
@Override
public void create(CreateWalletBillRecordDTO dto) {
@@ -96,9 +100,10 @@
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());
+ WalletDO walletDO = walletService.getOrCreateBySupplierId(walletBillRecordDO.getSupplierId());
RLock lock = redissonClient.getLock(String.format(LockConstants.WALLET_ID_KEY, walletDO.getId()));
try {
if (lock.tryLock(10, 30, TimeUnit.SECONDS)) {
@@ -118,9 +123,9 @@
throw new RuntimeException(e);
}
//回写提现状态
- if (StringUtils.isEmpty(walletBillRecordDO.getWithdrawRecordId())) {
+ if (!StringUtils.isEmpty(walletBillRecordDO.getWithdrawRecordId())) {
WalletWithdrawRecordDO withdrawRecordDO = walletWithdrawRecordMapper.selectById(walletBillRecordDO.getWithdrawRecordId());
- withdrawRecordDO.setWithdrawState(Constants.WALLET_WITHDRAW_STATE.SUCCESS.name());
+ withdrawRecordDO.setWithdrawState(Constants.BILL_WITHDRAW_TYPE.success.name());
walletWithdrawRecordMapper.updateById(withdrawRecordDO);
}
@@ -128,16 +133,35 @@
walletBillRecordDO.setTransferState(Constants.SETTLEMENT_STATUS.FAILED.name());
walletBillRecordDO.update("sys");
walletBillRecordMapper.updateById(walletBillRecordDO);
- WalletDO walletDO = walletService.getOrCreateBySupplierId(walletBillRecordDO.getWalletId());
+ WalletDO walletDO = walletService.getOrCreateBySupplierId(walletBillRecordDO.getSupplierId());
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)) {
+ // 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());
+ walletBillRecordDO2.setId(UUIDGenerator.getUUID());
+ walletBillRecordDO2.setRemark("微信商户转账失败，余额返还钱包");
+ walletBillRecordDO2.setApproveBy("sys");
+ walletBillRecordDO2.setApproveTime(LocalDateTime.now());
+ // 保存账单明细
+ walletBillRecordService.save(walletBillRecordDO2);
//提现中金额:减少提现中金额
- 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 {
@@ -148,9 +172,9 @@
throw new RuntimeException(e);
}
//回写提现状态
- if (StringUtils.isEmpty(walletBillRecordDO.getWithdrawRecordId())) {
+ if (!StringUtils.isEmpty(walletBillRecordDO.getWithdrawRecordId())) {
WalletWithdrawRecordDO withdrawRecordDO = walletWithdrawRecordMapper.selectById(walletBillRecordDO.getWithdrawRecordId());
- withdrawRecordDO.setWithdrawState(Constants.WALLET_WITHDRAW_STATE.FAILURE.name());
+ withdrawRecordDO.setWithdrawState(Constants.BILL_WITHDRAW_TYPE.fail.name());
walletWithdrawRecordMapper.updateById(withdrawRecordDO);
}
}
@@ -159,6 +183,13 @@
@Override
public Page<WalletBillRecordVO> queryPage(QueryWalletBillRecordDTO queryWalletBillRecordDTO, Page page) {
+ try {
+ if (!StringUtils.isEmpty(queryWalletBillRecordDTO.getSupplierId())) {
+ Long supplierId = Long.parseLong(queryWalletBillRecordDTO.getSupplierId());
+ }
+ } catch (Exception e) {
+ throw new ValidationException("供应商ID格式不正确");
+ }
List<WalletBillRecordVO> list = walletBillRecordMapper.queryPage(queryWalletBillRecordDTO, page);
page.setRecords(list);
return page;
@@ -168,7 +199,7 @@
public void exportSupplierFinanceList(HttpServletResponse response, QueryWalletBillRecordDTO queryWalletBillRecordDTO) {
List<WalletBillRecordVO> list = walletBillRecordMapper.queryWalletBillRecordList(queryWalletBillRecordDTO);
- String[] rowsName = new String[]{"序号","供应商信息", "变动类型", "原金额", "变动金额", "现余额", "提交时间", "审核时间", "备注"};
+ String[] rowsName = new String[]{"序号","供应商信息", "变动类型", "原金额", "变动金额", "现余额", "提交时间", "审核时间", "备注", "操作人"};
List<Object[]> dataList = new ArrayList<>();
int sn = 1;
for (WalletBillRecordVO o : list) {
@@ -178,11 +209,16 @@
objs[a++] = o.getSupplierName()+":"+o.getSupplierId(); // 供应商信息
objs[a++] = o.getTypeName(); // 变动类型
objs[a++] = o.getOriginalAmount(); // 原金额
- objs[a++] = o.getChangeAmount(); // 变动金额
+ if (Constants.BILL_CHANGE_METHOD.reduce.name().equals(o.getMethod())) {
+ objs[a++] = "-" + o.getChangeAmount(); // 变动金额
+ } else {
+ objs[a++] = "+" + o.getChangeAmount(); // 变动金额
+ }
objs[a++] = o.getBalance(); //现余额
objs[a++] = o.getCreateTime();//提交时间
objs[a++] = o.getApproveTime(); // 审核时间
objs[a++] = o.getRemark(); //备注
+ objs[a++] = o.getApproveName(); //操作人
dataList.add(objs);
sn++;
}
@@ -203,4 +239,21 @@
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);
+ }
+
+ @Override
+ public BigDecimal getHistoryAmount(Long walletId, Long supplierId) {
+ return walletBillRecordMapper.getHistoryAmount(walletId,supplierId);
+ }
}
--
Gitblit v1.9.3