From 665c763cb07deb261cf4fa62c6eb574aec1d816a Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Mon, 30 Dec 2024 14:03:05 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java | 61 +++++++++++++++++++++++-------
1 files changed, 47 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java b/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
index 9a72659..6cd9324 100644
--- a/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
@@ -1,6 +1,7 @@
package com.nq.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.google.gson.Gson;
import com.nq.dao.*;
import com.nq.enums.EConfigKey;
@@ -20,12 +21,14 @@
import java.math.BigDecimal;
+import java.time.LocalDate;
import java.util.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import com.nq.utils.timeutil.DateTimeUtil;
+import com.nq.utils.timeutil.TimeUtil;
import org.apache.commons.collections.map.HashedMap;
import org.apache.commons.lang3.StringUtils;
@@ -91,6 +94,9 @@
@Autowired
UserAssetsMapper userAssetsMapper;
+ @Resource
+ StockTimeSettingMapper stockTimeSettingMapper;
+
@Transactional
public ServerResponse outMoney(String amt, String with_Pwd,String accsetType,String bankId,HttpServletRequest request) throws Exception {
if (StringUtils.isBlank(amt)) {
@@ -123,12 +129,11 @@
return ServerResponse.createByErrorMsg("Analog users cannot withdraw funds" + siteSetting.getWithMinAmt(),request);
}
-
- String time = iStockConfigServices.queryByKey(EConfigKey.WITHDRAW_TIME_SETTING.getCode()).getCValue();
-
- if (!WithDrawUtils.checkIsWithTime( Integer.parseInt(time.split("-")[0]), Integer.parseInt(time.split("-")[1]))) {
- return ServerResponse.createByErrorMsg("提现失败。提现时间为" + time.split("-")[0] + " - " + time.split("-")[1],request);
+ boolean b = getServerResponse();
+ if (!b) {
+ return ServerResponse.createByErrorMsg("提现失败,当前时间已停止提现", request);
}
+
BigDecimal useAmt = iUserAssetsServices.getAvailableBalance(accsetType,user.getId());
BigDecimal tAmt = new BigDecimal(amt);
if(useAmt.compareTo(tAmt)<0){
@@ -160,6 +165,17 @@
return ServerResponse.createByErrorMsg("提现密码不正确!",request);
}
+ }
+
+ private boolean getServerResponse() {
+ StockTimeSetting stockTimeSetting = stockTimeSettingMapper.selectOne(new QueryWrapper<StockTimeSetting>().eq("accets_type","IN"));
+ if(stockTimeSetting == null){
+ return false;
+ }
+ if(!stockTimeSetting.getWeekDay().contains(String.valueOf(LocalDate.now().getDayOfWeek().getValue()))){
+ return false;
+ }
+ return TimeUtil.isTradingHour(stockTimeSetting.getAmStartTime(), stockTimeSetting.getAmEndTime(), stockTimeSetting.getPmStartTime(), stockTimeSetting.getPmEndTime());
}
public ServerResponse<PageInfo> findUserWithList(String withStatus, HttpServletRequest request, int pageNum, int pageSize) {
@@ -225,6 +241,7 @@
return ServerResponse.createByErrorMsg("用户资金账户不存在");
}
userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(userWithdraw.getWithAmt()));
+ userAssets.setFreezeMoney(userAssets.getFreezeMoney().subtract(userWithdraw.getWithAmt()));
int updateUserCount = userAssetsMapper.updateById(userAssets);
if (updateUserCount > 0) {
@@ -313,6 +330,7 @@
}
+ @Transactional
public ServerResponse updateState(Integer withId, Integer state, String authMsg) throws Exception {
UserWithdraw userWithdraw = this.userWithdrawMapper.selectByPrimaryKey(withId);
SiteSetting siteSetting = siteSettingService.getSiteSetting();
@@ -326,18 +344,29 @@
if (state.intValue() == 3 &&
StringUtils.isBlank(authMsg)) {
return ServerResponse.createByErrorMsg("失败信息必填");
-
+ }
+ User user = this.userMapper.selectById(userWithdraw.getUserId());
+ if (user == null) {
+ return ServerResponse.createByErrorMsg("用户不存在");
+ }
+ UserAssets userAssets = iUserAssetsServices.assetsByTypeAndUserId("IN", user.getId());
+ if (userAssets == null) {
+ return ServerResponse.createByErrorMsg("用户资金账户不存在");
}
if (state == 3) {
- User user = this.userMapper.selectById(userWithdraw.getUserId());
- if (user == null) {
- return ServerResponse.createByErrorMsg("用户不存在");
+ if(userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) > 0){
+ BigDecimal subtract = userWithdraw.getWithAmt().subtract(userAssets.getAmountToBeCovered());
+ if(subtract.compareTo(BigDecimal.ZERO) > 0){
+ userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(subtract));
+ userAssets.setFreezeMoney(userAssets.getFreezeMoney().subtract(subtract));
+ userAssets.setAmountToBeCovered(BigDecimal.ZERO);
+ }else{
+ userAssets.setAmountToBeCovered(userAssets.getAmountToBeCovered().subtract(userWithdraw.getWithAmt()));
+ }
+ }else{
+ userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(userWithdraw.getWithAmt()));
+ userAssets.setFreezeMoney(userAssets.getFreezeMoney().subtract(userWithdraw.getWithAmt()));
}
- 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("提现失败，返还用户资金成功！");
@@ -346,7 +375,11 @@
throw new Exception("修改用户资金出错，抛出异常");
}
userWithdraw.setWithMsg(authMsg);
+ }else{
+ userAssets.setFreezeMoney(userAssets.getFreezeMoney().subtract(userWithdraw.getWithAmt()));
+ userAssetsMapper.updateById(userAssets);
}
+
userWithdraw.setWithStatus(state);
userWithdraw.setTransTime(new Date());
int updateCount = this.userWithdrawMapper.updateByPrimaryKeySelective(userWithdraw);
--
Gitblit v1.9.3