From 95a52a6087a7587c89253c099f3d76213f8318ab Mon Sep 17 00:00:00 2001
From: dd <gitluke@outlook.com>
Date: Wed, 28 Jan 2026 23:03:52 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java b/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
index 3fbd1fa..e08eeed 100644
--- a/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
@@ -25,6 +25,7 @@
import javax.servlet.http.HttpServletResponse;
import com.nq.utils.timeutil.TimeUtil;
+import com.nq.vo.pay.OutMoneyVo;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
@@ -66,7 +67,7 @@
@Autowired
ISiteSettingService iSiteSettingService;
- @Autowired
+ @Autowired
UserBankMapper userBankMapper;
@Autowired
@@ -79,7 +80,7 @@
StockTimeSettingMapper stockTimeSettingMapper;
@Transactional(rollbackFor = Exception.class)
- public ServerResponse outMoney(String amt, String with_Pwd,String accsetType,String bankId,HttpServletRequest request) throws Exception {
+ public ServerResponse outMoney(OutMoneyVo outMoneyVo,String amt, String with_Pwd, String accsetType, HttpServletRequest request) throws Exception {
if (StringUtils.isBlank(amt)) {
return ServerResponse.createByErrorMsg("The parameter cannot be null");
}
@@ -98,10 +99,10 @@
if (user.getIsActive() != 2) {
return ServerResponse.createByErrorMsg("未实名认证",request);
}
- UserBank userBank = this.userBankMapper.selectById(bankId);
- if (userBank == null) {
- return ServerResponse.createByErrorMsg("银行卡不存在",request);
- }
+// UserBank userBank = this.userBankMapper.selectById(bankId);
+// if (userBank == null) {
+// return ServerResponse.createByErrorMsg("银行卡不存在",request);
+// }
if (user.getAccountType().intValue() == 1) {
return ServerResponse.createByErrorMsg("模拟用户无法提取资金",request);
}
@@ -128,9 +129,11 @@
userWithdraw.setWithAmt(new BigDecimal(amt));
userWithdraw.setApplyTime(new Date());
userWithdraw.setWithName(user.getRealName());
- userWithdraw.setBankNo(userBank.getBankNo());
- userWithdraw.setBankName(userBank.getBankName());
- userWithdraw.setBankAddress(userBank.getBankAddress());
+ userWithdraw.setBankNo(outMoneyVo.getBankNo());
+ userWithdraw.setBankName(outMoneyVo.getBankName());
+ userWithdraw.setBankAddress(outMoneyVo.getBankAddress());
+ userWithdraw.setBranchCode(outMoneyVo.getBranchCode());
+ userWithdraw.setCardholderName(outMoneyVo.getCardholderName());
userWithdraw.setWithStatus(Integer.valueOf(0));
BigDecimal withfee = siteSetting.getWithFeePercent().multiply(new BigDecimal(amt)).add(new BigDecimal(siteSetting.getWithFeeSingle().intValue()));
userWithdraw.setWithFee(withfee);
@@ -332,7 +335,7 @@
if (user == null) {
return ServerResponse.createByErrorMsg("用户不存在");
}
- UserAssets userAssets = iUserAssetsServices.assetsByTypeAndUserId(EStockType.getDefault().getCode(), user.getId());
+ UserAssets userAssets = iUserAssetsServices.assetsByTypeAndUserId(userWithdraw.getAccsetType(), user.getId());
if (userAssets == null) {
return ServerResponse.createByErrorMsg("用户资金账户不存在");
}
@@ -412,5 +415,12 @@
}
+
+ @Override
+ public int countPendingWithdraw() {
+ com.baomidou.mybatisplus.core.conditions.query.QueryWrapper<UserWithdraw> queryWrapper = new com.baomidou.mybatisplus.core.conditions.query.QueryWrapper<>();
+ queryWrapper.eq("with_status", 0);
+ return this.userWithdrawMapper.selectCount(queryWrapper).intValue();
+ }
}
--
Gitblit v1.9.3