From afb9b1cefb1c2d2f57fe8f0f3c19efa354669c66 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 14 Jan 2026 14:42:08 +0800
Subject: [PATCH] 1

---
 src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java |  353 +++++++++++++---------------------------------------------
 1 files changed, 81 insertions(+), 272 deletions(-)

diff --git a/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java b/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
index 10debed..aae1bfa 100644
--- a/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
@@ -1,14 +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.EStockType;
 import com.nq.enums.EUserAssets;
-import com.nq.pay.PayUtil;
 import com.nq.pojo.*;
 import com.nq.service.*;
 import com.github.pagehelper.PageHelper;
@@ -17,28 +15,16 @@
 
 import com.nq.common.ServerResponse;
 
-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.io.UnsupportedEncodingException;
 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;
@@ -48,8 +34,6 @@
 
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.stereotype.Service;
-
-import static com.nq.utils.timeutil.DateTimeUtil.STANDARD_FORMAT;
 
 
 @Service("iUserWithdrawService")
@@ -80,25 +64,13 @@
     AgentUserMapper agentUserMapper;
 
     @Autowired
-    IUserPositionService iUserPositionService;
-
-    @Autowired
-    IUserBankService iUserBankService;
-
-    @Autowired
     ISiteSettingService iSiteSettingService;
 
-    @Autowired
-    ISiteProductService iSiteProductService;
-
-    @Autowired
+                      @Autowired
     UserBankMapper userBankMapper;
 
     @Autowired
     SiteSettingServiceImpl siteSettingService;
-
-    @Autowired
-    IStockConfigServices iStockConfigServices;
 
     @Autowired
     UserAssetsMapper userAssetsMapper;
@@ -106,10 +78,7 @@
     @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");
@@ -129,10 +98,10 @@
             if (user.getIsActive() != 2) {
                 return ServerResponse.createByErrorMsg("未实名认证",request);
             }
-            UserBank userBank = this.userBankMapper.selectById(bankId);
-            if (userBank == null) {
-                return ServerResponse.createByErrorMsg("银行卡不存在",request);
-            }
+//            UserBank userBank = this.userBankMapper.selectById(bankId);
+//            if (userBank == null) {
+//                return ServerResponse.createByErrorMsg("银行卡不存在",request);
+//            }
             if (user.getAccountType().intValue() == 1) {
                 return ServerResponse.createByErrorMsg("模拟用户无法提取资金",request);
             }
@@ -141,7 +110,7 @@
                 return ServerResponse.createByErrorMsg("最小提现金额:" + siteSetting.getWithMinAmt(),request);
             }
 
-            boolean b = getServerResponse();
+            boolean b = getServerResponse(accsetType);
             if (!b) {
                 return ServerResponse.createByErrorMsg("提现失败,当前时间已停止提现", request);
             }
@@ -159,12 +128,14 @@
             userWithdraw.setWithAmt(new BigDecimal(amt));
             userWithdraw.setApplyTime(new Date());
             userWithdraw.setWithName(user.getRealName());
-            userWithdraw.setBankNo(userBank.getBankNo());
-            userWithdraw.setBankName(userBank.getBankName());
-            userWithdraw.setBankAddress(userBank.getBankAddress());
+            userWithdraw.setBankNo(bankId);
+//            userWithdraw.setBankNo(userBank.getBankNo());
+//            userWithdraw.setBankName(userBank.getBankName());
+//            userWithdraw.setBankAddress(userBank.getBankAddress());
             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);
@@ -179,8 +150,8 @@
 
     }
 
-    private boolean getServerResponse() {
-        StockTimeSetting stockTimeSetting = stockTimeSettingMapper.selectOne(new QueryWrapper<StockTimeSetting>().eq("accets_type", "IN"));
+    private boolean getServerResponse(String accsetType) {
+        StockTimeSetting stockTimeSetting = stockTimeSettingMapper.selectOne(new QueryWrapper<StockTimeSetting>().eq("accets_type", EUserAssets.WITHDRAW.getCode()));
         if (stockTimeSetting == null) {
             return false;
         }
@@ -248,7 +219,7 @@
             User user = this.userMapper.selectById(userWithdraw.getUserId());
 
 
-            UserAssets userAssets = iUserAssetsServices.assetsByTypeAndUserId("IN", user.getId());
+            UserAssets userAssets = iUserAssetsServices.assetsByTypeAndUserId(EStockType.getDefault().getCode(), user.getId());
             if (userAssets == null) {
                 return ServerResponse.createByErrorMsg("用户资金账户不存在");
             }
@@ -342,166 +313,73 @@
     }
 
 
-    @Transactional
-    public ServerResponse updateState(Integer withId, Integer state, String authMsg,
-                                      HttpServletRequest request, HttpServletResponse response) 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);
+    @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);
+            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(userWithdraw.getAccsetType(), 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);
-            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 if(state == 1){//走代付
-            String result = payForAnOrder(request, response, userWithdraw);
-            if(StringUtils.isEmpty(result)){
-                return ServerResponse.createByErrorMsg("代付打款失败!");
-            }
-            ObjectMapper objectMapper = new ObjectMapper();
-
-            // 将 JSON 字符串转换为实体类对象
-            TransferResponseBo transferResponseBo = objectMapper.readValue(result, TransferResponseBo.class);
-            if(transferResponseBo.getRespCode().equals("FAIL")){
-                log.error("代付下单失败:"+result);
-                return ServerResponse.createByErrorMsg("代付下单失败:",request);
-            }
-            TransferResponse transferResponse = new TransferResponse();
-            transferResponse.setRespCode(transferResponseBo.getRespCode());
-            transferResponse.setSignType(transferResponseBo.getSignType());
-            transferResponse.setSign(transferResponseBo.getSign());
-            transferResponse.setMerTransferId(transferResponseBo.getMerTransferId());
-            transferResponse.setTransferAmount(new BigDecimal(transferResponseBo.getTransferAmount()));
-            transferResponse.setApplyDate(transferResponseBo.getApplyDate());
-            transferResponse.setTradeNo(transferResponseBo.getTradeNo());
-            transferResponse.setTradeResult(0);
-            transferResponse.setCallbackState(0);
-            transferResponse.setUserId(user.getId());
-            transferResponse.setCreatedAt(new Date());
-            transferResponse.setWithId(withId);
-            transferResponseService.save(transferResponse);
-
-            userAssets.setFreezeMoney(userAssets.getFreezeMoney().subtract(userWithdraw.getWithAmt()));
-            userAssetsMapper.updateById(userAssets);
-            userWithdraw.setWithStatus(4);
-            userWithdraw.setTransTime(new Date());
-            int updateCount = this.userWithdrawMapper.updateByPrimaryKeySelective(userWithdraw);
-            if (updateCount > 0) {
-                return ServerResponse.createBySuccessMsg("操作成功!");
-            }
+        }catch (Exception e){
+            log.info("提现失败:"+e.getMessage());
+            throw e;
         }
         return ServerResponse.createBySuccessMsg("操作失败!");
-    }
-
-    public String payForAnOrder(HttpServletRequest request, HttpServletResponse response,UserWithdraw userWithdraw) throws IOException {
-        request.setCharacterEncoding("UTF-8");
-        Map<String, String> reqMap = new HashMap<String, String>();
-        //申请时间 时间格式:yyyy-MM-dd HH:mm:ss
-        reqMap.put("apply_date", getOrderTime());
-        //收款银行代码	详见附件银行编码或商户后台银行代码表
-        reqMap.put("bank_code", "IDPT0001");
-        //商户代码 平台分配唯一
-        reqMap.put("mch_id", "100789033");
-        // 商家转账订单号 保证每笔订单唯一
-        reqMap.put("mch_transferId", generatePayOrderId());
-        //收款银行账号	银行账号(巴西PIX代付填对应类型的PIX账号)
-        reqMap.put("receive_account", userWithdraw.getBankNo());
-        //收款银行户名
-        reqMap.put("receive_name", userWithdraw.getBankName());
-        //转账金额 整数,以元为单位
-        reqMap.put("transfer_amount", userWithdraw.getWithAmt().toString());
-        //备注
-        reqMap.put("remark", userWithdraw.getBankAddress());
-        //异步通知地址
-        reqMap.put("back_url", "https://api.durocaspitall.com/user/noticePayment.do");
-        String signStr = SignUtil.sortData(reqMap);
-        //签名方式 固定值MD5,不参与签名
-        reqMap.put("sign_type", "MD5");
-
-        String reqUrl = "https://api.watchglbpay.com/pay/transfer";
-        String merchant_key = "TKFMXNSNKDP0RUFEKV44SW411VUNDZLG";
-
-        String sign = SignAPI.sign(signStr, merchant_key);
-
-        reqMap.put("sign", sign);
-
-        System.out.println("reqMap:" + reqMap.toString().length() + " --> " + reqMap.toString());
-        System.out.println("签名参数排序:" + signStr.length() + " --> " + signStr);
-        System.out.println("sign值:" + sign.length() + " --> " + sign);
-
-        String result = HttpClientUtil.doPost(reqUrl, reqMap, "utf-8");
-        System.out.println("result值:" + result);
-        return result;
-    }
-
-    public String generatePayOrderId() {
-        // 获取当前时间戳(毫秒)
-        long timestamp = System.currentTimeMillis();
-
-        // 生成一个随机的UUID并截取前8位
-        String randomUUID = UUID.randomUUID().toString().replace("-", "").substring(0, 8);
-
-        // 将时间戳和随机UUID结合生成订单号
-        return timestamp + randomUUID;
-    }
-
-    public static String getOrderTime() {
-        // 获取当前时间
-        LocalDateTime now = LocalDateTime.now();
-
-        // 定义输出格式
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-
-        // 格式化当前时间
-        return now.format(formatter);
     }
 
     public int deleteByUserId(Integer userId) {
@@ -537,79 +415,10 @@
     }
 
     @Override
-    public void noticePayment(TradeResultVO vo, HttpServletResponse response) throws IOException {
-        log.info("代付回调信息:"+vo.toString());
-        synchronized (vo.getTradeNo()){
-            TransferResponse transferResponse = transferResponseService.getOne(new LambdaQueryWrapper<>(TransferResponse.class)
-                    .eq(TransferResponse::getMerTransferId, vo.getMerTransferId())
-                    .eq(TransferResponse::getTradeNo, vo.getTradeNo())
-                    .eq(TransferResponse::getTradeResult, 0)
-                    .eq(TransferResponse::getCallbackState, 0)
-            );
-
-            if(ObjectUtils.isNotEmpty(transferResponse)){
-                UserAssets userAssets = iUserAssetsServices.assetsByTypeAndUserId("IN", transferResponse.getUserId());
-                UserWithdraw userWithdraw = this.userWithdrawMapper.selectByPrimaryKey(transferResponse.getWithId());
-
-
-                if (transferResponse.getRespCode().equals("SUCCESS")) {
-                    transferResponse.setTradeResult(1);
-                    transferResponse.setCallbackState(1);
-                    transferResponseService.updateById(transferResponse);
-
-                    userWithdraw.setWithStatus(1);
-                    userWithdraw.setTransTime(new Date());
-                    userWithdrawMapper.updateByPrimaryKeySelective(userWithdraw);
-
-                    log.info("代付回调----成功");
-                    PrintWriter pw = response.getWriter();
-                    pw.print("success");
-                    pw.flush();
-                    pw.close(); // 验签成功,响应SUCCESS
-                    return;
-                } else {
-                    if (userAssets == null) {
-                        log.error("用户资金账户不存在!");
-                        PrintWriter pw = response.getWriter();
-                        pw.print("Signature Error");
-                        pw.flush();
-                        pw.close();
-                        return;
-                    }
-                    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()));
-                    }
-                    int updateCount = userAssetsMapper.updateById(userAssets);
-                    if (updateCount > 0) {
-                        log.info("提现失败,返还用户资金成功!");
-                    } else {
-                        log.error("返还用户资金出错,抛出异常");
-                    }
-                    userWithdraw.setWithMsg("代付验证失败");
-                    userWithdraw.setWithStatus(2);
-                    userWithdraw.setTransTime(new Date());
-                    userWithdrawMapper.updateByPrimaryKeySelective(userWithdraw);
-                    transferResponse.setTradeResult(2);
-                    transferResponse.setCallbackState(2);
-                    transferResponseService.updateById(transferResponse);
-                    PrintWriter pw = response.getWriter();
-                    pw.print("Signature Error");
-                    pw.flush();
-                    pw.close();
-                }
-            }
-        }
+    public int countPendingWithdraw() {
+        com.baomidou.mybatisplus.core.conditions.query.QueryWrapper<UserWithdraw> queryWrapper = new com.baomidou.mybatisplus.core.conditions.query.QueryWrapper<>();
+        queryWrapper.eq("with_status", 0);
+        return this.userWithdrawMapper.selectCount(queryWrapper).intValue();
     }
-
 }
 

--
Gitblit v1.9.3