From 73e608df889ebeca1c87cb8d77676923b8872a83 Mon Sep 17 00:00:00 2001
From: dd <gitluke@outlook.com>
Date: Fri, 26 Dec 2025 02:40:01 +0800
Subject: [PATCH] 1

---
 src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java |  169 +++++++++++---------------------------------------------
 1 files changed, 34 insertions(+), 135 deletions(-)

diff --git a/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java b/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
index 3d721f4..c5de613 100644
--- a/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
@@ -88,9 +88,11 @@
     @Autowired
     IStockConfigServices iStockConfigServices;
 
+    @Autowired
+    UserAssetsMapper userAssetsMapper;
 
     @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");
         }
@@ -106,12 +108,12 @@
             if (user.getIsLogin().intValue() == 1) {
                 return ServerResponse.createByErrorMsg("用户被锁定",request);
             }
-            if (StringUtils.isBlank(user.getRealName()) || StringUtils.isBlank(user.getIdCard())) {
+            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);
@@ -219,7 +221,12 @@
             User user = this.userMapper.selectById(userWithdraw.getUserId());
 
 
-            int updateUserCount = this.userMapper.updateById(user);
+            UserAssets userAssets = iUserAssetsServices.assetsByTypeAndUserId("IN", user.getId());
+            if (userAssets == null) {
+                return ServerResponse.createByErrorMsg("用户资金账户不存在");
+            }
+            userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(userWithdraw.getWithAmt()));
+            int updateUserCount = userAssetsMapper.updateById(userAssets);
 
             if (updateUserCount > 0) {
 
@@ -306,7 +313,6 @@
 
     }
 
-
     public ServerResponse updateState(Integer withId, Integer state, String authMsg) throws Exception {
         UserWithdraw userWithdraw = this.userWithdrawMapper.selectByPrimaryKey(withId);
         SiteSetting siteSetting = siteSettingService.getSiteSetting();
@@ -320,14 +326,28 @@
         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) {
-            User user = this.userMapper.selectById(userWithdraw.getUserId());
-            if (user == null) {
-                return ServerResponse.createByErrorMsg("用户不存在");
+            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.setAmountToBeCovered(BigDecimal.ZERO);
+                }else{
+                    userAssets.setAmountToBeCovered(userAssets.getAmountToBeCovered().subtract(userWithdraw.getWithAmt()));
+                }
+            }else{
+                userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(userWithdraw.getWithAmt()));
             }
-            int updateCount = this.userMapper.updateById(user);
+            int updateCount = userAssetsMapper.updateById(userAssets);
             if (updateCount > 0) {
                 log.info("提现失败,返还用户资金成功!");
             } else {
@@ -335,21 +355,10 @@
                 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()));
-            }else{
-                withdrawMethod4(userWithdraw.getId()+"",bgAmount.toString(), userMapper.selectById(userWithdraw.getUserId()));
-            }
-
-
+        }else{
+            userAssetsMapper.updateById(userAssets);
         }
+
         userWithdraw.setWithStatus(state);
         userWithdraw.setTransTime(new Date());
         int updateCount = this.userWithdrawMapper.updateByPrimaryKeySelective(userWithdraw);
@@ -359,116 +368,6 @@
         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();
-        }
-        return -1;
-    }
-
-    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);
     }

--
Gitblit v1.9.3