From e89e71158de719c70c487110a0f8d00d4a30d30b Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Thu, 12 Feb 2026 11:02:48 +0800
Subject: [PATCH] 1

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

diff --git a/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java b/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
index db8c88e..4199ba2 100644
--- a/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
@@ -1,11 +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;
@@ -16,17 +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 org.apache.commons.collections.map.HashedMap;
+import com.nq.utils.timeutil.TimeUtil;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 
 import org.slf4j.Logger;
@@ -36,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")
@@ -91,8 +95,14 @@
     @Autowired
     UserAssetsMapper userAssetsMapper;
 
+    @Resource
+    StockTimeSettingMapper stockTimeSettingMapper;
+
+    @Autowired
+    TransferResponseService transferResponseService;
+
     @Transactional
-    public ServerResponse outMoney(String amt, String with_Pwd,String accsetType,HttpServletRequest request) throws Exception {
+    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");
         }
@@ -111,24 +121,23 @@
             if (user.getIsActive() != 2) {
                 return ServerResponse.createByErrorMsg("未实名认证",request);
             }
-            UserBank userBank = this.iUserBankService.findUserBankByUserId(user.getId());
+            UserBank userBank = this.userBankMapper.selectById(bankId);
             if (userBank == null) {
-                return ServerResponse.createByErrorMsg("未绑定银行卡",request);
+                return ServerResponse.createByErrorMsg("银行卡不存在",request);
             }
             if (user.getAccountType().intValue() == 1) {
                 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);
+                return ServerResponse.createByErrorMsg("最小提现金额:" + siteSetting.getWithMinAmt(),request);
             }
 
-
-            String time = iStockConfigServices.queryByKey(EConfigKey.WITHDRAW_TIME_SETTING.getCode()).getCValue();
-
-            if (!WithDrawUtils.checkIsWithTime( Integer.parseInt(time.split("-")[0]), Integer.parseInt(time.split("-")[1]))) {
-                return ServerResponse.createByErrorMsg("撤销失败了。提现时间为" + time.split("-")[0] + "点 - " + time.split("-")[1] + "点之间的",request);
+            boolean b = getServerResponse();
+            if (!b) {
+                return ServerResponse.createByErrorMsg("提现失败,当前时间已停止提现", request);
             }
+
             BigDecimal useAmt =  iUserAssetsServices.getAvailableBalance(accsetType,user.getId());
             BigDecimal tAmt = new BigDecimal(amt);
             if(useAmt.compareTo(tAmt)<0){
@@ -144,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);
@@ -162,6 +173,16 @@
 
     }
 
+    private boolean getServerResponse() {
+        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()))) {
+            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) {
 
@@ -221,11 +242,12 @@
             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("用户资金账户不存在");
             }
             userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(userWithdraw.getWithAmt()));
+            userAssets.setFreezeMoney(userAssets.getFreezeMoney().subtract(userWithdraw.getWithAmt()));
             int updateUserCount = userAssetsMapper.updateById(userAssets);
 
             if (updateUserCount > 0) {
@@ -314,172 +336,74 @@
     }
 
 
-    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("失败信息必填");
-
-        }
-        if (state == 3) {
+    @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("IN", user.getId());
+            UserAssets userAssets = iUserAssetsServices.assetsByTypeAndUserId("JP", 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 {
-                log.error("返还用户资金出错,抛出异常");
-                throw new Exception("修改用户资金出错,抛出异常");
-            }
-            userWithdraw.setWithMsg(authMsg);
-        }else if(state == 1){
-            // 发起第三方提现
-            BigDecimal bgAmount = userWithdraw.getWithAmt();
-            if(siteSetting.getWithdraw().equals("Top1")){
-                withdrawMethod1(userWithdraw.getId()+"",bgAmount.toString(), userMapper.selectById(userWithdraw.getUserId()));
-            } else if (siteSetting.getWithdraw().equals("Top2")) {
-                withdrawMethod2(userWithdraw.getId()+"",bgAmount.toString(), userMapper.selectById(userWithdraw.getUserId()));
-            }else if(siteSetting.getWithdraw().equals("Top3")){
-                withdrawMethod3(userWithdraw.getId()+"",bgAmount.toString(), userMapper.selectById(userWithdraw.getUserId()));
+            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.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{
-                withdrawMethod4(userWithdraw.getId()+"",bgAmount.toString(), userMapper.selectById(userWithdraw.getUserId()));
+                return ServerResponse.createByErrorMsg("请选择对应的操作!");
             }
-
-
-        }
-        userWithdraw.setWithStatus(state);
-        userWithdraw.setTransTime(new Date());
-        int updateCount = this.userWithdrawMapper.updateByPrimaryKeySelective(userWithdraw);
-        if (updateCount > 0) {
-            return ServerResponse.createBySuccessMsg("操作成功!");
-        }
-        return ServerResponse.createByErrorMsg("操作失败!");
-
-    }
-
-
-
-    public int withdrawMethod1(String ordersn, String payAmt, User user ) {
-        UserBank userBank =  userBankMapper.findUserBankByUserId(user.getId());
-        Map<String,String> map = new HashedMap();
-        map.put("mch_id",PayUtil.MCH_ID_TOP1);
-        map.put("back_url","http://www.jumptalk.net:8091/api/pay/withdrawNotify.do");
-        map.put("mch_transferId",ordersn);
-        map.put("transfer_amount",payAmt);
-        map.put("apply_date", DateTimeUtil.getCurrentDate(STANDARD_FORMAT));
-        map.put("bank_code",userBank.getBankImg());
-        map.put("receive_name",user.getRealName());
-        map.put("receive_account",userBank.getBankNo());
-        map.put("remark",userBank.getBankAddress());
-        String signStr = SignUtil.sortData(map);
-        map.put("sign_type","MD5");
-        try {
-            map.put("sign", SignAPI.sign(signStr,PayUtil.DF_TOKEN_TOP1));
-            String reponse = HttpClientUtil.doPost(PayUtil.PAY_TRANSFER_ORDER_TOP1, map, "utf-8");
-            com.alibaba.fastjson.JSONObject  object = com.alibaba.fastjson.JSONObject.parseObject(reponse);
         }catch (Exception e){
-            e.printStackTrace();
+            log.info("提现失败:"+e.getMessage());
+            throw e;
         }
-        return -1;
+        return ServerResponse.createBySuccessMsg("操作失败!");
     }
-
-    public int withdrawMethod2(String ordersn, String payAmt, User user ) {
-        UserBank userBank =  userBankMapper.findUserBankByUserId(user.getId());
-        Map<String,String> map = new HashedMap();
-        map.put("mch_id",PayUtil.MCH_ID_TOP2);
-        map.put("back_url","http://www.jumptalk.net:8091/api/pay/withdrawNotify2.do");
-        map.put("mch_transferId",ordersn);
-        map.put("transfer_amount",payAmt);
-        map.put("apply_date", DateTimeUtil.getCurrentDate(STANDARD_FORMAT));
-        map.put("bank_code",userBank.getBankImg());
-        map.put("receive_name",user.getRealName());
-        map.put("receive_account",userBank.getBankNo());
-        map.put("remark",userBank.getBankAddress());
-        String signStr = SignUtil.sortData(map);
-        log.error("加密前排序字符 {}", signStr);
-        map.put("sign_type","MD5");
-        try {
-            map.put("sign", SignAPI.sign(signStr,PayUtil.DF_TOKEN_TOP2));
-            log.info("支付通道2 代付的参数 {}",new Gson().toJson(map));
-            String reponse = HttpClientUtil.doPost(PayUtil.PAY_TRANSFER_ORDER_TOP2, map, "utf-8");
-            log.info("支付通道2 审核返回的 {}",reponse);
-            com.alibaba.fastjson.JSONObject  object = com.alibaba.fastjson.JSONObject.parseObject(reponse);
-        }catch (Exception e){
-            e.printStackTrace();
-        }
-        return -1;
-    }
-
-
-    public int withdrawMethod3(String ordersn, String payAmt, User user ) {
-        UserBank userBank =  userBankMapper.findUserBankByUserId(user.getId());
-        Map<String,String> map = new HashedMap();
-        map.put("mch_id",PayUtil.MCH_ID_TOP3);
-        map.put("back_url","http://www.jumptalk.net:8091/api/pay/withdrawNotify3.do");
-        map.put("mch_transferId",ordersn);
-        map.put("transfer_amount",payAmt);
-        map.put("apply_date", DateTimeUtil.getCurrentDate(STANDARD_FORMAT));
-        map.put("bank_code",userBank.getBankImg());
-        map.put("receive_name",user.getRealName());
-        map.put("receive_account",userBank.getBankNo());
-        map.put("remark",userBank.getBankAddress());
-        String signStr = SignUtil.sortData(map);
-        log.error("加密前排序字符 {}", signStr);
-        map.put("sign_type","MD5");
-        try {
-            map.put("sign", SignAPI.sign(signStr,PayUtil.DF_TOKEN_TOP3));
-            log.info("支付通道3 代付的参数 {}",new Gson().toJson(map));
-            String reponse = HttpClientUtil.doPost(PayUtil.PAY_TRANSFER_ORDER_TOP3, map, "utf-8");
-            log.info("支付通道3 审核返回的 {}",reponse);
-        }catch (Exception e){
-            e.printStackTrace();
-        }
-        return -1;
-    }
-
-
-    public int withdrawMethod4(String ordersn, String payAmt, User user ) {
-        UserBank userBank =  userBankMapper.findUserBankByUserId(user.getId());
-        Map<String,String> map = new HashedMap();
-        map.put("mch_id",PayUtil.MCH_ID_TOP4);
-        map.put("back_url","http://www.jumptalk.net:8091/api/pay/withdrawNotify4.do");
-        map.put("mch_transferId",ordersn);
-        map.put("transfer_amount",payAmt);
-        map.put("apply_date", DateTimeUtil.getCurrentDate(STANDARD_FORMAT));
-        map.put("bank_code",userBank.getBankImg());
-        map.put("receive_name",user.getRealName());
-        map.put("receive_account",userBank.getBankNo());
-        map.put("remark",userBank.getBankAddress());
-        String signStr = SignUtil.sortData(map);
-        map.put("sign_type","MD5");
-        try {
-            map.put("sign", SignAPI.sign(signStr,PayUtil.DF_TOKEN_TOP1));
-            String reponse = HttpClientUtil.doPost(PayUtil.PAY_TRANSFER_ORDER_TOP1, map, "utf-8");
-            log.info("支付通道4 审核返回的 {}",reponse);
-        }catch (Exception e){
-            e.printStackTrace();
-        }
-        return -1;
-    }
-
-
-
-
 
     public int deleteByUserId(Integer userId) {
         return this.userWithdrawMapper.deleteByUserId(userId);
@@ -512,6 +436,5 @@
 
 
     }
-
 }
 

--
Gitblit v1.9.3