From 162d5757abe946ece02657b5656dc06e27ce0a48 Mon Sep 17 00:00:00 2001
From: jack <zengjieli93@163.com>
Date: Thu, 28 Mar 2024 13:59:34 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java | 100 +++++++++-----------------------------------------
1 files changed, 18 insertions(+), 82 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java b/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
index 2475960..4ea7f7d 100644
--- a/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
@@ -1,9 +1,9 @@
package com.nq.service.impl;
-import cn.hutool.log.Log;
import com.google.gson.Gson;
import com.nq.dao.*;
+import com.nq.enums.EUserAssets;
import com.nq.pay.PayUtil;
import com.nq.pojo.*;
import com.nq.service.*;
@@ -14,6 +14,7 @@
import com.nq.common.ServerResponse;
import com.nq.utils.*;
+import com.nq.utils.http.HttpClientUtil;
import com.nq.utils.stock.WithDrawUtils;
import java.math.BigDecimal;
@@ -23,6 +24,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import com.nq.utils.timeutil.DateTimeUtil;
import org.apache.commons.collections.map.HashedMap;
import org.apache.commons.lang3.StringUtils;
@@ -34,7 +36,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.stereotype.Service;
-import static com.nq.utils.DateTimeUtil.STANDARD_FORMAT;
+import static com.nq.utils.timeutil.DateTimeUtil.STANDARD_FORMAT;
@Service("iUserWithdrawService")
@@ -51,8 +53,11 @@
IUserService iUserService;
- @Autowired
+ @Resource
UserMapper userMapper;
+
+ @Resource
+ IUserAssetsServices iUserAssetsServices;
@Autowired
@@ -81,7 +86,7 @@
@Transactional
- public ServerResponse outMoney(String amt, String with_Pwd, HttpServletRequest request) throws Exception {
+ public ServerResponse outMoney(String amt, String with_Pwd,String accsetType,HttpServletRequest request) throws Exception {
if (StringUtils.isBlank(amt)) {
return ServerResponse.createByErrorMsg("The parameter cannot be null");
}
@@ -148,69 +153,15 @@
}
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 index_user_amt = user.getUserIndexAmt();
-
- if (index_user_amt.compareTo(new BigDecimal("0")) == -1) {
-
- return ServerResponse.createByErrorMsg("Index funds cannot be less than 0");
-
+ BigDecimal useAmt = iUserAssetsServices.getAvailableBalance(accsetType,user.getId());
+ BigDecimal tAmt = new BigDecimal(amt);
+ if(useAmt.compareTo(tAmt)<0){
+ return ServerResponse.createByErrorMsg("Insufficient balance");
}
-
-
- BigDecimal futures_user_amt = user.getUserFutAmt();
-
- if (futures_user_amt.compareTo(new BigDecimal("0")) == -1) {
-
- return ServerResponse.createByErrorMsg("Futures capital cannot be less than 0");
-
- }
-
-
- BigDecimal enable_amt = user.getEnableAmt();
-
- int compareAmt = enable_amt.compareTo(new BigDecimal(amt));
-
- if (compareAmt == -1) {
-
- return ServerResponse.createByErrorMsg("Withdrawal failed, the user's available funds are insufficient");
-
- }
-
-
- BigDecimal user_all_amt = user.getUserAmt();
-
- BigDecimal reckon_all_amt = user_all_amt.subtract(new BigDecimal(amt));
-
- BigDecimal reckon_enable_amt = enable_amt.subtract(new BigDecimal(amt));
-
- user.setUserAmt(reckon_all_amt);
-
- user.setEnableAmt(reckon_enable_amt);
-
- log.info("用户提现{}，金额 = {},总资金 = {},可用资金 = {}", new Object[]{user.getId(), amt, user_all_amt, enable_amt});
-
-
- log.info("提现后，总金额={},可用资金={}", reckon_all_amt, reckon_enable_amt);
-
- int updateUserCount = this.userMapper.updateByPrimaryKeySelective(user);
-
- if (updateUserCount > 0) {
-
- log.info("修改用户资金成功");
-
- } else {
-
- log.error("修改用户资金失败");
-
- throw new Exception("用户提现，修改用户资金失败");
-
- }
+ iUserAssetsServices.availablebalanceChange(accsetType,user.getId(), EUserAssets.WITHDRAW,tAmt.negate(),"","");
UserWithdraw userWithdraw = new UserWithdraw();
userWithdraw.setUserId(user.getId());
userWithdraw.setNickName(user.getRealName());
@@ -296,17 +247,13 @@
log.info("修改用户提现订单 {} 状态成功", withId);
- User user = this.userMapper.selectByPrimaryKey(userWithdraw.getUserId());
+ User user = this.userMapper.selectById(userWithdraw.getUserId());
- user.setUserAmt(user.getUserAmt().add(userWithdraw.getWithAmt()));
- user.setEnableAmt(user.getEnableAmt().add(userWithdraw.getWithAmt()));
-
- int updateUserCount = this.userMapper.updateByPrimaryKeySelective(user);
+ int updateUserCount = this.userMapper.updateById(user);
if (updateUserCount > 0) {
- log.info("反还用户资金，总 {} 可用 {}", user.getUserAmt(), user.getEnableAmt());
return ServerResponse.createBySuccessMsg("Cancel Success");
@@ -407,22 +354,11 @@
}
if (state == 3) {
- User user = this.userMapper.selectByPrimaryKey(userWithdraw.getUserId());
+ User user = this.userMapper.selectById(userWithdraw.getUserId());
if (user == null) {
return ServerResponse.createByErrorMsg("用户不存在");
}
- BigDecimal user_amt = user.getUserAmt().add(userWithdraw.getWithAmt());
-
- log.info("管理员确认提现订单失败，返还用户 {} 总资金，原金额 = {} , 返还后 = {}", new Object[]{user.getId(), user.getUserAmt(), user_amt});
-
- user.setUserAmt(user_amt);
-
- BigDecimal user_enable_amt = user.getEnableAmt().add(userWithdraw.getWithAmt());
-
- log.info("管理员确认提现订单失败，返还用户 {} 可用资金，原金额 = {} , 返还后 = {}", new Object[]{user.getId(), user.getEnableAmt(), user_enable_amt});
-
- user.setEnableAmt(user_enable_amt);
- int updateCount = this.userMapper.updateByPrimaryKeySelective(user);
+ int updateCount = this.userMapper.updateById(user);
if (updateCount > 0) {
log.info("提现失败，返还用户资金成功！");
} else {
--
Gitblit v1.9.3