From 1c6748cbef6bf2348106b27fb47a74efff8a8b2e Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Tue, 10 Sep 2024 14:16:17 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java | 33 ++++++++++++++++++++++++++-------
1 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java b/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
index 5ddcdfc..a3beb29 100644
--- a/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
@@ -26,6 +26,7 @@
import javax.servlet.http.HttpServletRequest;
import com.nq.utils.timeutil.DateTimeUtil;
+import com.nq.utils.translate.GoogleTranslateUtil;
import org.apache.commons.collections.map.HashedMap;
import org.apache.commons.lang3.StringUtils;
@@ -92,7 +93,7 @@
UserAssetsMapper userAssetsMapper;
@Transactional
- public ServerResponse outMoney(String amt, String with_Pwd,String accsetType,HttpServletRequest request) throws Exception {
+ public ServerResponse outMoney(String amt, String with_Pwd,String accsetType, String walletAddress,Integer type,HttpServletRequest request) throws Exception {
if (StringUtils.isBlank(amt)) {
return ServerResponse.createByErrorMsg("The parameter cannot be null");
}
@@ -114,6 +115,9 @@
UserBank userBank = this.iUserBankService.findUserBankByUserId(user.getId());
if (userBank == null) {
return ServerResponse.createByErrorMsg("未绑定银行卡",request);
+ }
+ if (type == 1 && StringUtils.isEmpty(walletAddress)) {
+ return ServerResponse.createByErrorMsg("数字货币地址不能为空",request);
}
if (user.getAccountType().intValue() == 1) {
return ServerResponse.createByErrorMsg("模拟用户无法提取资金",request);
@@ -142,12 +146,19 @@
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());
+ if(type == 0){
+ userWithdraw.setBankNo(userBank.getBankNo());
+ userWithdraw.setBankName(userBank.getBankName());
+ userWithdraw.setBankAddress("银行卡");
+ }else{
+ userWithdraw.setBankNo(walletAddress);
+ userWithdraw.setBankName("加密货币");
+ userWithdraw.setBankAddress("加密货币");
+ }
userWithdraw.setWithStatus(Integer.valueOf(0));
BigDecimal withfee = siteSetting.getWithFeePercent().multiply(new BigDecimal(amt)).add(new BigDecimal(siteSetting.getWithFeeSingle().intValue()));
userWithdraw.setWithFee(withfee);
+ userWithdraw.setAssetsType(accsetType);
int insertCount = this.userWithdrawMapper.insert(userWithdraw);
if (insertCount > 0) {
return ServerResponse.createBySuccessMsg("提现成功",request);
@@ -172,7 +183,10 @@
List<UserWithdraw> userWithdraws = this.userWithdrawMapper.findUserWithList(user.getId(), withStatus);
-
+ userWithdraws.forEach(f->{
+ f.setBankName(new GoogleTranslateUtil().translate(f.getBankName(),request.getHeader("lang")));
+ f.setBankAddress(new GoogleTranslateUtil().translate(f.getBankAddress(),request.getHeader("lang")));
+ });
PageInfo pageInfo = new PageInfo(userWithdraws);
@@ -221,7 +235,12 @@
User user = this.userMapper.selectById(userWithdraw.getUserId());
- int updateUserCount = this.userMapper.updateById(user);
+ UserAssets userAssets = iUserAssetsServices.assetsByTypeAndUserId("JP", user.getId());
+ if (userAssets == null) {
+ return ServerResponse.createByErrorMsg("用户资金账户不存在");
+ }
+ userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(userWithdraw.getWithAmt()));
+ int updateUserCount = userAssetsMapper.updateById(userAssets);
if (updateUserCount > 0) {
@@ -329,7 +348,7 @@
if (user == null) {
return ServerResponse.createByErrorMsg("用户不存在");
}
- UserAssets userAssets = iUserAssetsServices.assetsByTypeAndUserId("IN", user.getId());
+ UserAssets userAssets = iUserAssetsServices.assetsByTypeAndUserId("JP", user.getId());
if (userAssets == null) {
return ServerResponse.createByErrorMsg("用户资金账户不存在");
}
--
Gitblit v1.9.3