From 2c9cdb539cbbde244eb98d5edc6377facffdd500 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Fri, 26 Sep 2025 11:55:41 +0800
Subject: [PATCH] 新增股票购买设置

---
 src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java |   41 +++++++++--------------------------------
 1 files changed, 9 insertions(+), 32 deletions(-)

diff --git a/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java b/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
index a52ce0d..6b65d9c 100644
--- a/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
@@ -1,11 +1,10 @@
 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.EStockType;
 import com.nq.enums.EUserAssets;
 import com.nq.pojo.*;
@@ -16,16 +15,9 @@
 
 import com.nq.common.ServerResponse;
 
-import com.nq.utils.*;
-import com.nq.utils.http.HttpClientUtil;
-
-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;
@@ -33,7 +25,6 @@
 import javax.servlet.http.HttpServletResponse;
 
 import com.nq.utils.timeutil.TimeUtil;
-import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 
 import org.slf4j.Logger;
@@ -73,16 +64,7 @@
     AgentUserMapper agentUserMapper;
 
     @Autowired
-    IUserPositionService iUserPositionService;
-
-    @Autowired
-    IUserBankService iUserBankService;
-
-    @Autowired
     ISiteSettingService iSiteSettingService;
-
-    @Autowired
-    ISiteProductService iSiteProductService;
 
     @Autowired
     UserBankMapper userBankMapper;
@@ -91,18 +73,12 @@
     SiteSettingServiceImpl siteSettingService;
 
     @Autowired
-    IStockConfigServices iStockConfigServices;
-
-    @Autowired
     UserAssetsMapper userAssetsMapper;
 
     @Resource
     StockTimeSettingMapper stockTimeSettingMapper;
 
-    @Autowired
-    TransferResponseService transferResponseService;
-
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public ServerResponse outMoney(String amt, String with_Pwd,String accsetType,String bankId,HttpServletRequest request) throws Exception {
         if (StringUtils.isBlank(amt)) {
             return ServerResponse.createByErrorMsg("The parameter cannot be null");
@@ -134,7 +110,7 @@
                 return ServerResponse.createByErrorMsg("最小提现金额：" + siteSetting.getWithMinAmt(),request);
             }
 
-            boolean b = getServerResponse();
+            boolean b = getServerResponse(accsetType);
             if (!b) {
                 return ServerResponse.createByErrorMsg("提现失败,当前时间已停止提现", request);
             }
@@ -158,6 +134,7 @@
             userWithdraw.setWithStatus(Integer.valueOf(0));
             BigDecimal withfee = siteSetting.getWithFeePercent().multiply(new BigDecimal(amt)).add(new BigDecimal(siteSetting.getWithFeeSingle().intValue()));
             userWithdraw.setWithFee(withfee);
+            userWithdraw.setAccsetType(accsetType);
             int insertCount = this.userWithdrawMapper.insert(userWithdraw);
             if (insertCount > 0) {
                 return ServerResponse.createBySuccessMsg("提现成功",request);
@@ -172,8 +149,8 @@
 
     }
 
-    private boolean getServerResponse() {
-        StockTimeSetting stockTimeSetting = stockTimeSettingMapper.selectOne(new QueryWrapper<StockTimeSetting>().eq("accets_type", EStockType.MX.getCode()));
+    private boolean getServerResponse(String accsetType) {
+        StockTimeSetting stockTimeSetting = stockTimeSettingMapper.selectOne(new QueryWrapper<StockTimeSetting>().eq("accets_type", EUserAssets.WITHDRAW.getCode()));
         if (stockTimeSetting == null) {
             return false;
         }
@@ -241,7 +218,7 @@
             User user = this.userMapper.selectById(userWithdraw.getUserId());
 
 
-            UserAssets userAssets = iUserAssetsServices.assetsByTypeAndUserId(EStockType.MX.getCode(), user.getId());
+            UserAssets userAssets = iUserAssetsServices.assetsByTypeAndUserId(EStockType.getDefault().getCode(), user.getId());
             if (userAssets == null) {
                 return ServerResponse.createByErrorMsg("用户资金账户不存在");
             }
@@ -335,7 +312,7 @@
     }
 
 
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public ServerResponse updateState(Integer withId, Integer state, String authMsg, HttpServletRequest request, HttpServletResponse response) throws Exception {
         try {
             UserWithdraw userWithdraw = this.userWithdrawMapper.selectByPrimaryKey(withId);
@@ -355,7 +332,7 @@
             if (user == null) {
                 return ServerResponse.createByErrorMsg("用户不存在");
             }
-            UserAssets userAssets = iUserAssetsServices.assetsByTypeAndUserId(EStockType.MX.getCode(), user.getId());
+            UserAssets userAssets = iUserAssetsServices.assetsByTypeAndUserId(userWithdraw.getAccsetType(), user.getId());
             if (userAssets == null) {
                 return ServerResponse.createByErrorMsg("用户资金账户不存在");
             }

--
Gitblit v1.9.3