From 5d232fcbf3799d5b8cdd6c1b1db52231dd493713 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Fri, 08 Aug 2025 23:05:57 +0800
Subject: [PATCH] 1

---
 src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java |  344 +--------------------------------------------------------
 1 files changed, 7 insertions(+), 337 deletions(-)

diff --git a/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java b/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
index 20d95a2..4199ba2 100644
--- a/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
@@ -153,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);
@@ -172,7 +174,7 @@
     }
 
     private boolean getServerResponse() {
-        StockTimeSetting stockTimeSetting = stockTimeSettingMapper.selectOne(new QueryWrapper<StockTimeSetting>().eq("accets_type", "IN"));
+        StockTimeSetting stockTimeSetting = stockTimeSettingMapper.selectOne(new QueryWrapper<StockTimeSetting>().eq("accets_type", "JP"));
         if (stockTimeSetting == null) {
             return false;
         }
@@ -240,7 +242,7 @@
             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("用户资金账户不存在");
             }
@@ -354,7 +356,7 @@
             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("用户资金账户不存在");
             }
@@ -393,198 +395,14 @@
                 if (updateCount > 0) {
                     return ServerResponse.createBySuccessMsg("操作成功!");
                 }
-            }else if(state == 1){//走代付
-                return getObjectServerResponseOne(withId, request, response, userWithdraw, user, userAssets);
-            }else if(state == 4){//代付 2
-                return getObjectServerResponseTwo(withId, request, response, userWithdraw, user, userAssets);
             }else{
-                return ServerResponse.createBySuccessMsg("请选择对应的操作!");
+                return ServerResponse.createByErrorMsg("请选择对应的操作!");
             }
         }catch (Exception e){
             log.info("提现失败:"+e.getMessage());
             throw e;
         }
         return ServerResponse.createBySuccessMsg("操作失败!");
-    }
-
-    private ServerResponse getObjectServerResponseTwo(Integer withId, HttpServletRequest request, HttpServletResponse response, UserWithdraw userWithdraw, User user, UserAssets userAssets) throws IOException {
-        String orderNumber = getOrderTime();
-        String result = payForAnOrderTwo(request, response,user, userWithdraw,orderNumber);
-
-        // 创建 ObjectMapper 实例
-        ObjectMapper objectMapper = new ObjectMapper();
-
-        // 将 JSON 字符串转换为实体类对象
-        PayoutResponse payResponse = objectMapper.readValue(result, PayoutResponse.class);
-        if (payResponse.getCode() == 1) {
-            log.error("代付打款失败!失败原因:"+payResponse.getMessage());
-            return ServerResponse.createByErrorMsg("代付打款失败!失败原因:"+payResponse.getMessage());
-        }
-
-        TransferResponse transferResponse = new TransferResponse();
-        transferResponse.setRespCode(String.valueOf(payResponse.getCode()));
-        transferResponse.setSignType("代付2");
-        transferResponse.setSign("代付2");
-        transferResponse.setErrorMsg(String.valueOf(payResponse.getErrno()));
-        transferResponse.setMerTransferId(orderNumber);
-        transferResponse.setTransferAmount(userWithdraw.getWithAmt());
-        // 获取当前日期和时间
-        LocalDateTime currentDateTime = LocalDateTime.now();
-        // 定义日期时间格式
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-        // 将当前时间格式化为字符串
-        String formattedDate = currentDateTime.format(formatter);
-        transferResponse.setApplyDate(formattedDate);
-        transferResponse.setTradeNo(payResponse.getData().getOrderNumber());
-        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("操作成功!");
-        }
-        return ServerResponse.createBySuccessMsg("操作失败!");
-    }
-
-    private ServerResponse<Object> getObjectServerResponseOne(Integer withId, HttpServletRequest request, HttpServletResponse response, UserWithdraw userWithdraw, User user, UserAssets userAssets) throws IOException {
-        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("操作成功!");
-        }
-        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 payForAnOrderTwo(HttpServletRequest request, HttpServletResponse response, User user, UserWithdraw userWithdraw, String orderNumber) throws IOException {
-        request.setCharacterEncoding("UTF-8");
-        // 创建一个Map来存储请求参数
-        Map<String, String> reqMap = new HashMap<String, String>();
-
-        // 填充Map参数
-        reqMap.put("merchantid", "T805673557385213");             // 商户号
-        reqMap.put("out_trade_no",orderNumber );      // 商户订单号
-        // 转换为 BigDecimal
-        BigDecimal amount = new BigDecimal(String.valueOf(userWithdraw.getWithAmt()));
-
-        // 保留两位小数,四舍五入
-        amount = amount.setScale(2, BigDecimal.ROUND_HALF_UP);
-        reqMap.put("total_fee", String.valueOf(amount));              // 交易金额(保留两位小数)
-        reqMap.put("notify_url", "https://www.example.com/notify"); // 异步通知地址
-        reqMap.put("timestamp", String.valueOf(System.currentTimeMillis())); // 时间戳
-        reqMap.put("payment_mode", "IMPS");             // 代付模式(IMPS)
-        reqMap.put("account_number", userWithdraw.getBankNo());     // 账号
-        reqMap.put("ifsc", userWithdraw.getBankName());                 // IFSC
-        reqMap.put("customer_name", StringUtils.isEmpty(UserNameUtil.formatCustomerName(user.getNickName())) ? "IsNotSet" : UserNameUtil.formatCustomerName(user.getNickName()));         // 客户姓名(必须是英文,去除空格)
-        reqMap.put("customer_mobile", user.getPhone());    // 客户手机号
-        reqMap.put("customer_email", "test@gmail.com");    // 客户手机号
-        // 生成签名
-        String sign = SignatureGeneratorUtil.generateSign(reqMap,"0cfc8e1a446a1e5214b4032f2d6007e2");
-        reqMap.put("sign", sign);
-        String reqUrl = "https://v2.fastechservicepro.com/payout/unifiedorder";
-        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) {
@@ -617,154 +435,6 @@
         return this.userWithdrawMapper.listByAdmin(agentId, userId, realName, state, beginTime, endTime);
 
 
-    }
-
-    @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") && (vo.getTradeResult().equals(1) || vo.getTradeResult().equals("1"))) {
-                    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("代付验证失败"+",回调信息【"+vo.toString()+"】");
-                    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();
-                }
-            }
-        }
-    }
-    @Override
-    public void noticePaymentTwo(PaymentCallbackTwo vo, HttpServletResponse response) throws IOException {
-        log.info("代付回调信息:"+vo.toString());
-        synchronized (vo.getOrder_number()){
-            TransferResponse transferResponse = transferResponseService.getOne(new LambdaQueryWrapper<>(TransferResponse.class)
-                    .eq(TransferResponse::getMerTransferId, vo.getOut_trade_no())
-                    .eq(TransferResponse::getTradeNo, vo.getOrder_number())
-                    .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(1) && vo.getStatus().equals("payout_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(vo.getStatus().equals("payout_fail")){
-                    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("代付2验证失败:"+vo.getFail_info()+",回调信息【"+vo.toString()+"】");
-                    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();
-                }
-            }
-        }
     }
 }
 

--
Gitblit v1.9.3