From 097be94690a981b1b7317aee1861c632d00dc51a Mon Sep 17 00:00:00 2001
From: peter <14100000001@qq.com>
Date: Sun, 31 Aug 2025 16:37:56 +0800
Subject: [PATCH] 修改客服地址
---
src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java | 146 ++++++++++++++++++++++++++----------------------
1 files changed, 80 insertions(+), 66 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java b/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
index 6cd9324..4199ba2 100644
--- a/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
@@ -1,12 +1,12 @@
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 +17,22 @@
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.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 +42,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 +98,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)) {
@@ -126,7 +130,7 @@
}
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);
+ return ServerResponse.createByErrorMsg("最小提现金额：" + siteSetting.getWithMinAmt(),request);
}
boolean b = getServerResponse();
@@ -149,10 +153,12 @@
userWithdraw.setWithName(user.getRealName());
userWithdraw.setBankNo(userBank.getBankNo());
userWithdraw.setBankName(userBank.getBankName());
- userWithdraw.setBankAddress(userBank.getBankAddress());
+ userWithdraw.setBankAddress(userBank.getBranchName());
+ 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);
+ log.info(userWithdraw.toString());
int insertCount = this.userWithdrawMapper.insert(userWithdraw);
if (insertCount > 0) {
return ServerResponse.createBySuccessMsg("提现成功",request);
@@ -168,11 +174,11 @@
}
private boolean getServerResponse() {
- StockTimeSetting stockTimeSetting = stockTimeSettingMapper.selectOne(new QueryWrapper<StockTimeSetting>().eq("accets_type","IN"));
- if(stockTimeSetting == null){
+ StockTimeSetting stockTimeSetting = stockTimeSettingMapper.selectOne(new QueryWrapper<StockTimeSetting>().eq("accets_type", "JP"));
+ if (stockTimeSetting == null) {
return false;
}
- if(!stockTimeSetting.getWeekDay().contains(String.valueOf(LocalDate.now().getDayOfWeek().getValue()))){
+ if (!stockTimeSetting.getWeekDay().contains(String.valueOf(LocalDate.now().getDayOfWeek().getValue()))) {
return false;
}
return TimeUtil.isTradingHour(stockTimeSetting.getAmStartTime(), stockTimeSetting.getAmEndTime(), stockTimeSetting.getPmStartTime(), stockTimeSetting.getPmEndTime());
@@ -236,7 +242,7 @@
User user = this.userMapper.selectById(userWithdraw.getUserId());
- UserAssets userAssets = iUserAssetsServices.assetsByTypeAndUserId("IN", user.getId());
+ UserAssets userAssets = iUserAssetsServices.assetsByTypeAndUserId("JP", user.getId());
if (userAssets == null) {
return ServerResponse.createByErrorMsg("用户资金账户不存在");
}
@@ -331,63 +337,72 @@
@Transactional
- 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().subtract(subtract));
- userAssets.setAmountToBeCovered(BigDecimal.ZERO);
+ 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("JP", 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.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 +436,5 @@
}
-
}
--
Gitblit v1.9.3