From 0227f0e8daf1b021e3aed7bceb1895e04cb3bedc Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 05 Jun 2024 15:20:30 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java | 79 +++++++++++++++------------------------
1 files changed, 30 insertions(+), 49 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java b/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
index 4ea7f7d..db8c88e 100644
--- a/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
@@ -3,6 +3,7 @@
import com.google.gson.Gson;
import com.nq.dao.*;
+import com.nq.enums.EConfigKey;
import com.nq.enums.EUserAssets;
import com.nq.pay.PayUtil;
import com.nq.pojo.*;
@@ -84,6 +85,11 @@
@Autowired
SiteSettingServiceImpl siteSettingService;
+ @Autowired
+ IStockConfigServices iStockConfigServices;
+
+ @Autowired
+ UserAssetsMapper userAssetsMapper;
@Transactional
public ServerResponse outMoney(String amt, String with_Pwd,String accsetType,HttpServletRequest request) throws Exception {
@@ -100,66 +106,33 @@
}
if (w.equals(with_Pwd)) {
if (user.getIsLogin().intValue() == 1) {
- return ServerResponse.createByErrorMsg("User locked");
+ return ServerResponse.createByErrorMsg("用户被锁定",request);
}
-
-
- List<UserPosition> userPositions = this.iUserPositionService.findPositionByUserIdAndSellIdIsNull(user.getId());
-
- if (userPositions.size() > 0) {
- return ServerResponse.createByErrorMsg("There is no deposit with warehouse receipt");
-
+ if (user.getIsActive() != 2) {
+ return ServerResponse.createByErrorMsg("未实名认证",request);
}
-
-
- if (StringUtils.isBlank(user.getRealName()) || StringUtils.isBlank(user.getIdCard())) {
-
- return ServerResponse.createByErrorMsg("No real name authentication");
-
- }
-
UserBank userBank = this.iUserBankService.findUserBankByUserId(user.getId());
-
if (userBank == null) {
-
- return ServerResponse.createByErrorMsg("No bank card added");
-
+ return ServerResponse.createByErrorMsg("未绑定银行卡",request);
}
-
-
if (user.getAccountType().intValue() == 1) {
-
- return ServerResponse.createByErrorMsg("Analog users cannot withdraw funds");
-
+ return ServerResponse.createByErrorMsg("模拟用户无法提取资金",request);
}
-
-
SiteSetting siteSetting = this.iSiteSettingService.getSiteSetting();
-
if ((new BigDecimal(amt)).compareTo(new BigDecimal(siteSetting.getWithMinAmt().intValue())) == -1) {
-
- return ServerResponse.createByErrorMsg("Analog users cannot withdraw funds" + siteSetting.getWithMinAmt());
-
+ return ServerResponse.createByErrorMsg("Analog users cannot withdraw funds" + siteSetting.getWithMinAmt(),request);
}
- int with_time_begin = siteSetting.getWithTimeBegin().intValue();
+ String time = iStockConfigServices.queryByKey(EConfigKey.WITHDRAW_TIME_SETTING.getCode()).getCValue();
- int with_time_end = siteSetting.getWithTimeEnd().intValue();
-
- SiteProduct siteProduct = iSiteProductService.getProductSetting();
- if(siteProduct.getHolidayDisplay()){
- return ServerResponse.createByErrorMsg("Withdrawals are not allowed on weekends or holidays！");
+ if (!WithDrawUtils.checkIsWithTime( Integer.parseInt(time.split("-")[0]), Integer.parseInt(time.split("-")[1]))) {
+ return ServerResponse.createByErrorMsg("撤销失败了。提现时间为" + time.split("-")[0] + "点 - " + time.split("-")[1] + "点之间的",request);
}
-
- if (!WithDrawUtils.checkIsWithTime(with_time_begin, with_time_end)) {
- return ServerResponse.createByErrorMsg("Withdrawal failed. Withdrawal time is at" + with_time_begin + "point - " + with_time_end + "point among");
- }
-
BigDecimal useAmt = iUserAssetsServices.getAvailableBalance(accsetType,user.getId());
BigDecimal tAmt = new BigDecimal(amt);
if(useAmt.compareTo(tAmt)<0){
- return ServerResponse.createByErrorMsg("Insufficient balance");
+ return ServerResponse.createByErrorMsg("余额不足",request);
}
iUserAssetsServices.availablebalanceChange(accsetType,user.getId(), EUserAssets.WITHDRAW,tAmt.negate(),"","");
UserWithdraw userWithdraw = new UserWithdraw();
@@ -177,16 +150,14 @@
userWithdraw.setWithFee(withfee);
int insertCount = this.userWithdrawMapper.insert(userWithdraw);
if (insertCount > 0) {
-
- return ServerResponse.createBySuccessMsg("Successful withdrawal");
-
+ return ServerResponse.createBySuccessMsg("提现成功",request);
}
log.error("保存提现记录失败");
throw new Exception("用户提现，保存提现记录失败");
} else {
- return ServerResponse.createByErrorMsg("The withdrawal password is incorrect！！");
+ return ServerResponse.createByErrorMsg("提现密码不正确!",request);
}
}
@@ -250,7 +221,12 @@
User user = this.userMapper.selectById(userWithdraw.getUserId());
- int updateUserCount = this.userMapper.updateById(user);
+ UserAssets userAssets = iUserAssetsServices.assetsByTypeAndUserId("IN", user.getId());
+ if (userAssets == null) {
+ return ServerResponse.createByErrorMsg("用户资金账户不存在");
+ }
+ userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(userWithdraw.getWithAmt()));
+ int updateUserCount = userAssetsMapper.updateById(userAssets);
if (updateUserCount > 0) {
@@ -358,7 +334,12 @@
if (user == null) {
return ServerResponse.createByErrorMsg("用户不存在");
}
- int updateCount = this.userMapper.updateById(user);
+ UserAssets userAssets = iUserAssetsServices.assetsByTypeAndUserId("IN", 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