From 5f97f550b3fb60ac2142d7ca3c78d6bd04f18b80 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Fri, 11 Oct 2024 17:08:57 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java | 55 +++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 43 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java b/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
index c707f79..51714c2 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;
@@ -88,9 +89,11 @@
@Autowired
IStockConfigServices iStockConfigServices;
+ @Autowired
+ 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");
}
@@ -112,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);
@@ -140,24 +146,36 @@
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.setBranch("银行卡");
+ userWithdraw.setPayeeName(userBank.getPayeeName());
+ userWithdraw.setBankAddress("银行卡");
+ }else{
+ userWithdraw.setBankNo(walletAddress);
+ userWithdraw.setPayeeName("加密货币");
+ userWithdraw.setBankName("加密货币");
+ userWithdraw.setBranch("加密货币");
+ userWithdraw.setBankAddress("加密货币");
+ }
+
+ userWithdraw.setBranchNo(userBank.getBranchNo());
+
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);
+ log.info("userWithdraw------------:"+userWithdraw.toString());
+ log.info("userBank--------------:"+userBank.toString());
int insertCount = this.userWithdrawMapper.insert(userWithdraw);
if (insertCount > 0) {
return ServerResponse.createBySuccessMsg("提现成功",request);
}
-
- log.error("保存提现记录失败");
-
- throw new Exception("用户提现，保存提现记录失败");
} else {
return ServerResponse.createByErrorMsg("提现密码不正确!",request);
}
-
+ return ServerResponse.createBySuccessMsg("提现成功",request);
}
@@ -170,7 +188,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);
@@ -219,7 +240,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) {
@@ -327,7 +353,12 @@
if (user == null) {
return ServerResponse.createByErrorMsg("用户不存在");
}
- int updateCount = 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 updateCount = userAssetsMapper.updateById(userAssets);
if (updateCount > 0) {
log.info("提现失败，返还用户资金成功！");
} else {
--
Gitblit v1.9.3