From eb357bb9938d569734b04948695726b80c5dfb85 Mon Sep 17 00:00:00 2001
From: peter <14100000001@qq.com>
Date: Wed, 19 Nov 2025 10:40:27 +0800
Subject: [PATCH] 代理后台新增删除用户、提现审核
---
src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java | 184 ++++++++++++++++++++++++++++-----------------
1 files changed, 113 insertions(+), 71 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java b/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
index c3ef163..03a2bf4 100644
--- a/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
@@ -1,12 +1,13 @@
package com.nq.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
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.*;
import com.nq.service.*;
import com.github.pagehelper.PageHelper;
@@ -17,19 +18,23 @@
import com.nq.utils.*;
import com.nq.utils.http.HttpClientUtil;
-import com.nq.utils.stock.WithDrawUtils;
+import java.io.IOException;
+import java.io.PrintWriter;
import java.math.BigDecimal;
import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
import java.util.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
-import com.nq.utils.timeutil.DateTimeUtil;
import com.nq.utils.timeutil.TimeUtil;
-import org.apache.commons.collections.map.HashedMap;
+import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
@@ -39,8 +44,6 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.stereotype.Service;
-
-import static com.nq.utils.timeutil.DateTimeUtil.STANDARD_FORMAT;
@Service("iUserWithdrawService")
@@ -97,6 +100,9 @@
@Resource
StockTimeSettingMapper stockTimeSettingMapper;
+ @Autowired
+ TransferResponseService transferResponseService;
+
@Transactional
public ServerResponse outMoney(String amt, String with_Pwd,String accsetType,String bankId,HttpServletRequest request) throws Exception {
if (StringUtils.isBlank(amt)) {
@@ -125,9 +131,9 @@
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(),request);
- }
+// if ((new BigDecimal(amt)).compareTo(new BigDecimal(siteSetting.getWithMinAmt().intValue())) == -1) {
+// return ServerResponse.createByErrorMsg("最小提现金额：" + siteSetting.getWithMinAmt(),request);
+// }
boolean b = getServerResponse();
if (!b) {
@@ -168,14 +174,42 @@
}
private boolean getServerResponse() {
- StockTimeSetting stockTimeSetting = stockTimeSettingMapper.selectOne(new QueryWrapper<StockTimeSetting>().eq("accets_type","IN"));
- if(stockTimeSetting == null){
- return false;
+ StockConfig stockConfig = iStockConfigServices.queryByKey(EConfigKey.WITHDRAW_TIME_SETTING.getCode());
+ return isInTimeRange(stockConfig.getCValue());
+ }
+
+
+ /**
+ * 判断当前时间是否在指定的时间区间内
+ * @param timeRange 时间区间字符串，格式如："9:00-18:00"
+ * @return 如果在区间内返回true，否则返回false
+ */
+ public static boolean isInTimeRange(String timeRange) {
+ try {
+ String[] times = timeRange.split("-");
+ if (times.length != 2) {
+ throw new IllegalArgumentException("时间格式不正确，应为：HH:mm-HH:mm");
+ }
+
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("H:mm");
+ LocalTime startTime = LocalTime.parse(times[0].trim(), formatter);
+ LocalTime endTime = LocalTime.parse(times[1].trim(), formatter);
+ LocalTime currentTime = LocalTime.now();
+
+ boolean isInRange;
+ if (endTime.isBefore(startTime)) {
+ // 跨天情况，将结束时间视为次日
+ isInRange = !currentTime.isBefore(startTime) || !currentTime.isAfter(endTime);
+ } else {
+ // 不跨天情况
+ isInRange = !currentTime.isBefore(startTime) && !currentTime.isAfter(endTime);
+ }
+
+ return isInRange;
+
+ } catch (Exception e) {
+ throw new IllegalArgumentException("时间解析错误，请检查格式是否正确", e);
}
- 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) {
@@ -236,7 +270,7 @@
User user = this.userMapper.selectById(userWithdraw.getUserId());
- UserAssets userAssets = iUserAssetsServices.assetsByTypeAndUserId("IN", user.getId());
+ UserAssets userAssets = iUserAssetsServices.assetsByTypeAndUserId("US", user.getId());
if (userAssets == null) {
return ServerResponse.createByErrorMsg("用户资金账户不存在");
}
@@ -330,64 +364,73 @@
}
- public ServerResponse updateState(Integer withId, Integer state, String authMsg) throws Exception {
- UserWithdraw userWithdraw = this.userWithdrawMapper.selectByPrimaryKey(withId);
- SiteSetting siteSetting = siteSettingService.getSiteSetting();
- if (userWithdraw == null) {
- return ServerResponse.createByErrorMsg("提现订单不存在");
- }
- log.info("当前系统设置 {}", new Gson().toJson(siteSetting));
- if (userWithdraw.getWithStatus().intValue() != 0) {
- return ServerResponse.createByErrorMsg("提现订单已处理，不要重复操作");
- }
- 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) {
- 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().add(userAssets.getAmountToBeCovered()));
- userAssets.setAmountToBeCovered(BigDecimal.ZERO);
+ @Transactional
+ public ServerResponse updateState(Integer withId, Integer state, String authMsg, HttpServletRequest request, HttpServletResponse response) throws Exception {
+ try {
+ UserWithdraw userWithdraw = this.userWithdrawMapper.selectByPrimaryKey(withId);
+ SiteSetting siteSetting = siteSettingService.getSiteSetting();
+ if (userWithdraw == null) {
+ return ServerResponse.createByErrorMsg("提现订单不存在");
+ }
+ log.info("当前系统设置 {}", new Gson().toJson(siteSetting));
+ if (userWithdraw.getWithStatus().intValue() != 0) {
+ return ServerResponse.createByErrorMsg("提现订单已处理，不要重复操作");
+ }
+ 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("US", user.getId());
+ if (userAssets == null) {
+ return ServerResponse.createByErrorMsg("用户资金账户不存在");
+ }
+ if (state == 3) {
+ 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.setAmountToBeCovered(userAssets.getAmountToBeCovered().subtract(userWithdraw.getWithAmt()));
- userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(userWithdraw.getWithAmt()));
+ userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(userWithdraw.getWithAmt()));
+ userAssets.setFreezeMoney(userAssets.getFreezeMoney().subtract(userWithdraw.getWithAmt()));
+ }
+ int updateCount = userAssetsMapper.updateById(userAssets);
+ if (updateCount > 0) {
+ log.info("提现失败，返还用户资金成功！");
+ } else {
+ log.error("返还用户资金出错，抛出异常");
+ throw new Exception("修改用户资金出错，抛出异常");
+ }
+ userWithdraw.setWithMsg(authMsg);
+ userWithdraw.setWithStatus(2);
+ userWithdraw.setTransTime(new Date());
+ userWithdrawMapper.updateByPrimaryKeySelective(userWithdraw);
+ return ServerResponse.createBySuccessMsg("操作成功！");
+ }else if(state == 2){//手动打款
+ userAssets.setFreezeMoney(userAssets.getFreezeMoney().subtract(userWithdraw.getWithAmt()));
+ userAssetsMapper.updateById(userAssets);
+ userWithdraw.setWithStatus(1);
+ userWithdraw.setTransTime(new Date());
+ int updateCount = this.userWithdrawMapper.updateByPrimaryKeySelective(userWithdraw);
+ if (updateCount > 0) {
+ return ServerResponse.createBySuccessMsg("操作成功！");
}
}else{
- userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(userWithdraw.getWithAmt()));
- userAssets.setFreezeMoney(userAssets.getFreezeMoney().subtract(userWithdraw.getWithAmt()));
+ return ServerResponse.createByErrorMsg("请选择对应的操作！");
}
- int updateCount = userAssetsMapper.updateById(userAssets);
- if (updateCount > 0) {
- log.info("提现失败，返还用户资金成功！");
- } else {
- log.error("返还用户资金出错，抛出异常");
- throw new Exception("修改用户资金出错，抛出异常");
- }
- userWithdraw.setWithMsg(authMsg);
- }else{
- userAssets.setFreezeMoney(userAssets.getFreezeMoney().subtract(userWithdraw.getWithAmt()));
- userAssetsMapper.updateById(userAssets);
+ }catch (Exception e){
+ log.info("提现失败："+e.getMessage());
+ throw e;
}
-
- userWithdraw.setWithStatus(state);
- userWithdraw.setTransTime(new Date());
- int updateCount = this.userWithdrawMapper.updateByPrimaryKeySelective(userWithdraw);
- if (updateCount > 0) {
- return ServerResponse.createBySuccessMsg("操作成功！");
- }
- return ServerResponse.createByErrorMsg("操作失败！");
-
+ return ServerResponse.createBySuccessMsg("操作失败！");
}
public int deleteByUserId(Integer userId) {
@@ -421,6 +464,5 @@
}
-
}
--
Gitblit v1.9.3