From d33532187f3ec248cc279d6600a77a74e6e75097 Mon Sep 17 00:00:00 2001
From: zyy3 <zyy3@zy.com>
Date: Mon, 25 Aug 2025 23:02:07 +0800
Subject: [PATCH] 11

---
 src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java |   96 ++++++++++++------------------------------------
 1 files changed, 24 insertions(+), 72 deletions(-)

diff --git a/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java b/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
index 2da019a..6f436e5 100644
--- a/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
@@ -3,7 +3,6 @@
 
 import com.google.gson.Gson;
 import com.nq.dao.*;
-import com.nq.enums.EStockType;
 import com.nq.enums.EUserAssets;
 import com.nq.pay.PayUtil;
 import com.nq.pojo.*;
@@ -18,7 +17,6 @@
 import com.nq.utils.http.HttpClientUtil;
 import com.nq.utils.stock.WithDrawUtils;
 
-import java.lang.annotation.ElementType;
 import java.math.BigDecimal;
 
 import java.util.*;
@@ -59,9 +57,8 @@
     UserMapper userMapper;
 
     @Resource
-    IUserAssetsServices userAssetsServices;
-    @Resource
-    UserAssetsMapper userAssetsMapper;
+    IUserAssetsServices iUserAssetsServices;
+
 
     @Autowired
     IAgentUserService iAgentUserService;
@@ -86,18 +83,16 @@
 
     @Autowired
     SiteSettingServiceImpl siteSettingService;
-
-    @Autowired
-    SitePayMapper sitePayMapper;
+    @Resource
+    UserAssetsMapper userAssetsMapper;
 
 
     @Transactional
-    public ServerResponse outMoney(String amt, String with_Pwd,String accsetType,String walletAddress,String actualWithdrawal,String coinType,String amtPwd,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");
         }
         User user = this.iUserService.getCurrentRefreshUser(request);
-        User dbuser = this.userMapper.selectById(user.getId());
         String w = user.getWithPwd();
         if (w == null) {
             w = "";
@@ -107,65 +102,37 @@
         }
         if (w.equals(with_Pwd)) {
             if (user.getIsLogin().intValue() == 1) {
-                return ServerResponse.createByErrorMsg("User locked");
+                return ServerResponse.createByErrorMsg("用户被锁定",request);
             }
-            if (amtPwd==null||amtPwd.equals("")){
-                return ServerResponse.createByErrorMsg("Fund password is null");
-            }
-            if (!amtPwd.equals(dbuser.getAmtPwd())){
-                return ServerResponse.createByErrorMsg("Fund password error");
-            }
-
             if (StringUtils.isBlank(user.getRealName()) || StringUtils.isBlank(user.getIdCard())) {
-
-                return ServerResponse.createByErrorMsg("No real name authentication");
-
+                return ServerResponse.createByErrorMsg("未实名认证",request);
             }
-
             UserBank userBank = this.iUserBankService.findUserBankByUserId(user.getId());
-
             if (userBank == null) {
-
-                return ServerResponse.createByErrorMsg("No bank card added");
-
+                return ServerResponse.createByErrorMsg("未绑定银行卡",request);
             }
-
-
             if (user.getAccountType().intValue() == 1) {
-
-                return ServerResponse.createByErrorMsg("Analog users cannot withdraw funds");
-
+                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());
-
+                return ServerResponse.createByErrorMsg("最低提款金额:" + siteSetting.getWithMinAmt(),request);
             }
-
-
             int with_time_begin = siteSetting.getWithTimeBegin().intValue();
-
             int with_time_end = siteSetting.getWithTimeEnd().intValue();
-
             SiteProduct siteProduct = iSiteProductService.getProductSetting();
             if(siteProduct.getHolidayDisplay()){
-                return ServerResponse.createByErrorMsg("Withdrawals are not allowed on weekends or holidays!");
+                return ServerResponse.createByErrorMsg("周末或节假日不允许提款!",request);
             }
-
             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");
+                return ServerResponse.createByErrorMsg("撤销失败了。提现时间为" + with_time_begin + "点 - " + with_time_end + "点之间的",request);
             }
-
-            BigDecimal useAmt =  userAssetsServices.getAvailableBalance(accsetType,user.getId());
+            BigDecimal useAmt =  iUserAssetsServices.getAvailableBalance(accsetType,user.getId());
             BigDecimal tAmt = new BigDecimal(amt);
             if(useAmt.compareTo(tAmt)<0){
-                return ServerResponse.createByErrorMsg("Insufficient balance");
+                return ServerResponse.createByErrorMsg("余额不足",request);
             }
-            userAssetsServices.availablebalanceChange(accsetType,user.getId(), EUserAssets.WITHDRAW,tAmt.negate(),"","");
+            iUserAssetsServices.availablebalanceChange(accsetType,user.getId(), EUserAssets.WITHDRAW,tAmt.negate(),"","");
             UserWithdraw userWithdraw = new UserWithdraw();
             userWithdraw.setUserId(user.getId());
             userWithdraw.setNickName(user.getRealName());
@@ -177,35 +144,19 @@
             userWithdraw.setBankName(userBank.getBankName());
             userWithdraw.setBankAddress(userBank.getBankAddress());
             userWithdraw.setWithStatus(Integer.valueOf(0));
-            userWithdraw.setWalletAddress(walletAddress);
-            userWithdraw.setCoinType(coinType);
-            if (coinType!=null&&!coinType.equals("")){
-                SitePay sitePay = sitePayMapper.selectByChannelType(coinType);
-                BigDecimal actualWithdrawalAmt = new BigDecimal(amt);
-                if (sitePay!=null&&sitePay.getExchangeRate()>0){
-                    BigDecimal ex = new BigDecimal(sitePay.getExchangeRate());
-                    userWithdraw.setActualWithdrawal(actualWithdrawalAmt.divide(ex));
-                }else {
-                    userWithdraw.setActualWithdrawal(actualWithdrawalAmt);
-                }
-            }else {
-                BigDecimal actualWithdrawalAmt = new BigDecimal(amt);
-                userWithdraw.setActualWithdrawal(actualWithdrawalAmt.multiply(BigDecimal.ONE));
-            }
             BigDecimal withfee = siteSetting.getWithFeePercent().multiply(new BigDecimal(amt)).add(new BigDecimal(siteSetting.getWithFeeSingle().intValue()));
             userWithdraw.setWithFee(withfee);
+            userWithdraw.setAssetsType(accsetType);
             int insertCount = this.userWithdrawMapper.insert(userWithdraw);
             if (insertCount > 0) {
-
-                return ServerResponse.createBySuccessMsg("Successful withdrawal");
-
+                return ServerResponse.createBySuccessMsg("提现成功",request);
             }
 
             log.error("保存提现记录失败");
 
             throw new Exception("用户提现,保存提现记录失败");
         } else {
-            return ServerResponse.createByErrorMsg("The withdrawal password is incorrect!!");
+            return ServerResponse.createByErrorMsg("提现密码不正确!",request);
         }
 
     }
@@ -377,7 +328,12 @@
             if (user == null) {
                 return ServerResponse.createByErrorMsg("用户不存在");
             }
-            int updateCount = this.userMapper.updateById(user);
+            UserAssets userAssets = iUserAssetsServices.assetsByTypeAndUserId(userWithdraw.getAssetsType(), 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("提现失败,返还用户资金成功!");
             } else {
@@ -385,10 +341,6 @@
                 throw new Exception("修改用户资金出错,抛出异常");
             }
             userWithdraw.setWithMsg(authMsg);
-            UserAssets userAssets = userAssetsServices.selectByUserId(user.getId(), EStockType.IN.getCode());
-            userAssets.setTotleAssets(userAssets.getTotleAssets().add(userWithdraw.getWithAmt()));
-            userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(userWithdraw.getWithAmt()));
-            userAssetsMapper.updateById(userAssets);
         }else if(state == 1){
             // 发起第三方提现
             BigDecimal bgAmount = userWithdraw.getWithAmt();

--
Gitblit v1.9.3