From 662ae3929a78bc6ab44d12519c6d3d3910c8b5c0 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 08 Apr 2026 18:41:57 +0800
Subject: [PATCH] 1

---
 src/main/java/com/nq/service/IPayService.java                  |    3 
 src/main/java/com/nq/controller/protol/UserController.java     |    4 
 src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java |  124 ++++++++++----------
 src/main/java/com/nq/service/impl/PayServiceImpl.java          |  197 +++++++++++++++-----------------
 4 files changed, 153 insertions(+), 175 deletions(-)

diff --git a/src/main/java/com/nq/controller/protol/UserController.java b/src/main/java/com/nq/controller/protol/UserController.java
index dbcea91..588c371 100644
--- a/src/main/java/com/nq/controller/protol/UserController.java
+++ b/src/main/java/com/nq/controller/protol/UserController.java
@@ -522,8 +522,8 @@
      * 代付回调接口
      */
     @PostMapping({"payoutCallback.do"})
-    public void payoutCallback(@RequestBody PayoutCallbackVo callbackVo, HttpServletResponse response) throws IOException {
-        payService.payoutCallback(callbackVo, response);
+    public void payoutCallback(HttpServletRequest request, HttpServletResponse response) throws IOException {
+        payService.payoutCallback(request, response);
     }
 
 
diff --git a/src/main/java/com/nq/service/IPayService.java b/src/main/java/com/nq/service/IPayService.java
index 02447a4..f2fbc20 100644
--- a/src/main/java/com/nq/service/IPayService.java
+++ b/src/main/java/com/nq/service/IPayService.java
@@ -5,7 +5,6 @@
 import com.nq.pojo.PaymentResponse;
 import com.nq.pojo.PayV2NotifyRequest;
 import com.nq.pojo.PayV2PayoutNotifyRequest;
-import com.nq.pojo.PayoutCallbackVo;
 import com.nq.pojo.RechargeCallbackVo;
 import com.nq.pojo.TransactionStatusVo;
 
@@ -43,7 +42,7 @@
 
     void rechargeCallbackFour(PayV2NotifyRequest vo, HttpServletResponse response) throws IOException;
 
-    void payoutCallback(PayoutCallbackVo vo, HttpServletResponse response) throws IOException;
+    void payoutCallback(HttpServletRequest request, HttpServletResponse response) throws IOException;
 
     void payoutCallbackThree(PayV2PayoutNotifyRequest vo, HttpServletResponse response) throws IOException;
 }
diff --git a/src/main/java/com/nq/service/impl/PayServiceImpl.java b/src/main/java/com/nq/service/impl/PayServiceImpl.java
index e3a5caa..f1aec9f 100644
--- a/src/main/java/com/nq/service/impl/PayServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/PayServiceImpl.java
@@ -149,7 +149,7 @@
         String orderId = generatePayOrderId();
         BigDecimal amount = new BigDecimal(tradeAmount).setScale(2, RoundingMode.HALF_UP);
 
-        String notifyUrl = "https://api.greenbackcaps.top/user/rechargeCallbackFour.do";
+        String notifyUrl = "https://api.nalandacapital.mom/user/rechargeCallbackFour.do";
         String custId = "U" + user.getId();
         String mobile = StringUtils.isNotBlank(user.getPhone()) ? user.getPhone() : "0000000000";
         if (mobile.length() > 16) {
@@ -273,7 +273,7 @@
         dataObj.put("customerEmail","123456@qq.com");//需替换
         dataObj.put("customerPhone",user.getPhone());//需替换
         dataObj.put("merchantOrderNo",generatePayOrderId());//自定义订单号
-        dataObj.put("notifyUrl", "https://api.greenbackcaps.top/user/rechargeCallbackZero.do");//回调通知地址
+        dataObj.put("notifyUrl", "https://api.nalandacapital.mom/user/rechargeCallbackZero.do");//回调通知地址
         JSONObject requestObj = new JSONObject();
         log.info("代收参数:{}", dataObj);
         // 加密数据
@@ -372,8 +372,8 @@
         params.put("merchant_order_id", merchantOrderId);
         params.put("amount", amount.toString());
         params.put("pay_channel", payChannel);
-        params.put("notify_url", "https://api.greenbackcaps.top/user/rechargeCallbackThree.do"); // 异步通知地址
-        params.put("page_return_url", "https://stock.greenbackcaps.top/#/user"); // 前端返回地址
+        params.put("notify_url", "https://api.nalandacapital.mom/user/rechargeCallbackThree.do"); // 异步通知地址
+        params.put("page_return_url", "https://stock.nalandacapital.mom/#/user"); // 前端返回地址
 
         // 可选参数
         if (user != null) {
@@ -466,7 +466,7 @@
         // 保留两位小数,四舍五入
         amount = amount.setScale(2, BigDecimal.ROUND_HALF_UP);
         params.put("total_fee", String.valueOf(amount));         // 交易金额(保留两位小数)
-        params.put("notify_url", "https://api.greenbackcaps.top/user/rechargeCallbackTwo.do"); // 异步通知地址
+        params.put("notify_url", "https://api.nalandacapital.mom/user/rechargeCallbackTwo.do"); // 异步通知地址
         params.put("reply_type", "URL");          // 执行方式
         params.put("timestamp", String.valueOf(System.currentTimeMillis()));     // 时间戳
         params.put("customer_name", StringUtils.isEmpty(UserNameUtil.formatCustomerName(user.getNickName())) ? "IsNotSet" : UserNameUtil.formatCustomerName(user.getNickName()));    // 客户姓名
@@ -528,7 +528,7 @@
         //商家订单号 保证每笔订单唯一
         params.put("mch_order_no", generatePayOrderId());
         //异步通知地址 不超过 200 字节,支付成功后发起,不能携带参数
-        params.put("notify_url", "https://api.greenbackcaps.top/user/rechargeCallback.do");
+        params.put("notify_url", "https://api.nalandacapital.mom/user/rechargeCallback.do");
         // 订单时间  时间格式yyyy-MM-dd HH:mm:ss
         params.put("order_date", getOrderTime());
         //支付类型 请查阅商户后台通道编码
@@ -1580,140 +1580,123 @@
      * 代付回调处理
      */
     @Override
-    public void payoutCallback(PayoutCallbackVo vo, HttpServletResponse response) throws IOException {
-        log.info("代付回调进来了:" + vo.toString());
-        
+    public void payoutCallback(HttpServletRequest request, HttpServletResponse response) throws IOException {
+        response.setStatus(200);
+        response.setContentType("text/plain;charset=UTF-8");
         PrintWriter pw = response.getWriter();
-        
-        try {
-            // 验证签名
-            String key = "PAXkm5ptBhvzNYBSpdm3p7ipwGUQOF8Fm3tYp0"; // 商户密钥
-            Map<String, String> signParams = new HashMap<>();
-            signParams.put("merchant_id", vo.getMerchantId());
-            signParams.put("app_id", vo.getAppId());
-            signParams.put("system_order_id", vo.getSystemOrderId());
-            signParams.put("merchant_order_id", vo.getMerchantOrderId());
-            signParams.put("amount", vo.getAmount());
-            signParams.put("order_status", vo.getOrderStatus());
-            signParams.put("msg", vo.getMsg());
-            
-            boolean signValid = PaymentSignUtil.verifySign(signParams, key, vo.getSign());
-            if (!signValid) {
-                log.error("代付回调签名验证失败");
-                pw.print("error 签名验证失败");
-                pw.flush();
-                pw.close();
-                return;
-            }
-            
-            // 根据商户订单号查找代付记录
+
+        String tradeResult = request.getParameter("tradeResult");
+        String merTransferId = request.getParameter("merTransferId");
+        String merNo = request.getParameter("merNo");
+        String tradeNo = request.getParameter("tradeNo");
+        String transferAmount = request.getParameter("transferAmount");
+        String applyDate = request.getParameter("applyDate");
+        String version = request.getParameter("version");
+        String respCode = request.getParameter("respCode");
+        String sign = request.getParameter("sign");
+        String signType = request.getParameter("signType");
+        log.info("watchglb代付回调: tradeResult={}, merTransferId={}, merNo={}, tradeNo={}, transferAmount={}, applyDate={}, version={}, respCode={}, signType={}",
+                tradeResult, merTransferId, merNo, tradeNo, transferAmount, applyDate, version, respCode, signType);
+
+        if (StringUtils.isBlank(merTransferId) || StringUtils.isBlank(tradeResult)) {
+            pw.print("FAIL");
+            pw.flush();
+            pw.close();
+            return;
+        }
+
+        String key = "CZ5Q6NNI6D9YTCXZAIWIC8SAQCC35UZR";
+        Map<String, String> signParams = new TreeMap<>();
+        if (StringUtils.isNotBlank(tradeResult)) signParams.put("tradeResult", tradeResult);
+        if (StringUtils.isNotBlank(merTransferId)) signParams.put("merTransferId", merTransferId);
+        if (StringUtils.isNotBlank(merNo)) signParams.put("merNo", merNo);
+        if (StringUtils.isNotBlank(tradeNo)) signParams.put("tradeNo", tradeNo);
+        if (StringUtils.isNotBlank(transferAmount)) signParams.put("transferAmount", transferAmount);
+        if (StringUtils.isNotBlank(applyDate)) signParams.put("applyDate", applyDate);
+        if (StringUtils.isNotBlank(version)) signParams.put("version", version);
+        if (StringUtils.isNotBlank(respCode)) signParams.put("respCode", respCode);
+
+        if (!PaymentSignUtil.verifySign(signParams, key, sign)) {
+            log.error("watchglb代付回调验签失败, merTransferId={}, signParams={}", merTransferId, signParams);
+            pw.print("FAIL");
+            pw.flush();
+            pw.close();
+            return;
+        }
+
+        synchronized (merTransferId) {
             TransferResponse transferResponse = transferResponseService.getOne(
                     new LambdaQueryWrapper<>(TransferResponse.class)
-                            .eq(TransferResponse::getMerTransferId, vo.getMerchantOrderId())
+                            .eq(TransferResponse::getMerTransferId, merTransferId)
             );
-            
             if (ObjectUtils.isEmpty(transferResponse)) {
-                log.info("未找到代付订单记录,商户订单号:{}", vo.getMerchantOrderId());
-                pw.print("error 未找到代付订单");
+                log.error("未找到代付记录,merTransferId={}", merTransferId);
+                pw.print("FAIL");
                 pw.flush();
                 pw.close();
                 return;
             }
-            
-            // 检查是否已处理过
             if (transferResponse.getCallbackState() != 0) {
-                log.info("代付回调已处理过,商户订单号:{}", vo.getMerchantOrderId());
                 pw.print("success");
                 pw.flush();
                 pw.close();
                 return;
             }
-            
-            // 查找提现记录
+
             UserWithdraw userWithdraw = userWithdrawMapper.selectByPrimaryKey(transferResponse.getWithId());
             if (ObjectUtils.isEmpty(userWithdraw)) {
-                log.info("未找到提现记录,withId:{}", transferResponse.getWithId());
-                pw.print("error 未找到提现记录");
+                log.error("未找到提现记录,withId={}", transferResponse.getWithId());
+                pw.print("FAIL");
                 pw.flush();
                 pw.close();
                 return;
             }
-            
-            // 根据订单状态处理
-            String orderStatus = vo.getOrderStatus();
-            if ("WAIT_CONFIRM".equals(orderStatus) || "WAIT_PAY".equals(orderStatus) || "PAY_ING".equals(orderStatus)) {
-                log.info("代付回调交易中,商户订单号:{},状态:{}", vo.getMerchantOrderId(), orderStatus);
-                pw.print("success");
-                pw.flush();
-                pw.close();
-                return;
-            } else if ("PAY_FAIL".equals(orderStatus)) {
-                // 代付失败
-                transferResponse.setTradeResult(2); // 失败
-                transferResponse.setCallbackState(2); // 失败
-                transferResponse.setRespCode("FAIL"); // 响应状态:失败
-                transferResponse.setErrorMsg(vo.getMsg()); // 失败原因
-                transferResponse.setSignType("MD5"); // 签名方式
-                transferResponse.setSign(vo.getSign()); // 签名
-                transferResponse.setUpdatedAt(new Date());
+
+            transferResponse.setTradeNo(StringUtils.defaultIfBlank(tradeNo, transferResponse.getTradeNo()));
+            transferResponse.setSignType(StringUtils.defaultIfBlank(signType, "MD5"));
+            transferResponse.setSign(sign);
+            transferResponse.setRespCode(StringUtils.defaultIfBlank(respCode, "SUCCESS"));
+            transferResponse.setApplyDate(StringUtils.defaultIfBlank(applyDate, transferResponse.getApplyDate()));
+            transferResponse.setUpdatedAt(new Date());
+
+            if ("1".equals(tradeResult)) {
+                transferResponse.setTradeResult(1);
+                transferResponse.setCallbackState(1);
                 transferResponseService.updateById(transferResponse);
-                
-                userWithdraw.setWithStatus(2); // 失败
-                userWithdraw.setWithMsg("Withdrawal failed:" + vo.getMsg());
+
+                userWithdraw.setWithStatus(1);
+                userWithdraw.setWithMsg("代付成功");
                 userWithdraw.setTransTime(new Date());
                 userWithdrawMapper.updateByPrimaryKeySelective(userWithdraw);
-                
-                // 返还用户资金
+
+                UserAssets userAssets = iUserAssetsServices.assetsByTypeAndUserId("IN", userWithdraw.getUserId());
+                if (userAssets != null) {
+                    userAssets.setFreezeMoney(userAssets.getFreezeMoney().subtract(userWithdraw.getWithAmt()));
+                    userAssetsMapper.updateById(userAssets);
+                }
+                pw.print("success");
+            } else if ("2".equals(tradeResult)) {
+                transferResponse.setTradeResult(2);
+                transferResponse.setCallbackState(2);
+                transferResponse.setErrorMsg("watchglb payout failed");
+                transferResponseService.updateById(transferResponse);
+
+                userWithdraw.setWithStatus(2);
+                userWithdraw.setWithMsg("Withdrawal failed:watchglb payout failed");
+                userWithdraw.setTransTime(new Date());
+                userWithdrawMapper.updateByPrimaryKeySelective(userWithdraw);
+
                 UserAssets userAssets = iUserAssetsServices.assetsByTypeAndUserId("IN", userWithdraw.getUserId());
                 if (userAssets != null) {
                     userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(userWithdraw.getWithAmt()));
                     userAssets.setFreezeMoney(userAssets.getFreezeMoney().subtract(userWithdraw.getWithAmt()));
                     userAssetsMapper.updateById(userAssets);
                 }
-                
-                log.info("代付回调失败,商户订单号:{}", vo.getMerchantOrderId());
                 pw.print("success");
-                pw.flush();
-                pw.close();
-                return;
-            } else if ("PAY_SUCCESS".equals(orderStatus)) {
-                // 代付成功
-                transferResponse.setTradeResult(1); // 成功
-                transferResponse.setCallbackState(1); // 成功
-                transferResponse.setRespCode("SUCCESS"); // 响应状态:成功
-                transferResponse.setSignType("MD5"); // 签名方式
-                transferResponse.setSign(vo.getSign()); // 签名
-                transferResponse.setUpdatedAt(new Date());
-                transferResponseService.updateById(transferResponse);
-                
-                userWithdraw.setWithStatus(1); // 成功
-                userWithdraw.setWithMsg("代付成功");
-                userWithdraw.setTransTime(new Date());
-                userWithdrawMapper.updateByPrimaryKeySelective(userWithdraw);
-                
-                // 扣除冻结资金
-                UserAssets userAssets = iUserAssetsServices.assetsByTypeAndUserId("IN", userWithdraw.getUserId());
-                if (userAssets != null) {
-                    userAssets.setFreezeMoney(userAssets.getFreezeMoney().subtract(userWithdraw.getWithAmt()));
-                    userAssetsMapper.updateById(userAssets);
-                }
-                
-                log.info("代付回调成功,商户订单号:{}", vo.getMerchantOrderId());
-                pw.print("success");
-                pw.flush();
-                pw.close();
-                return;
             } else {
-                log.error("代付回调未知状态,商户订单号:{},状态:{}", vo.getMerchantOrderId(), orderStatus);
-                pw.print("error 未知状态");
-                pw.flush();
-                pw.close();
-                return;
+                log.warn("watchglb回调状态未知, merTransferId={}, tradeResult={}", merTransferId, tradeResult);
+                pw.print("success");
             }
-            
-        } catch (Exception e) {
-            log.error("代付回调处理异常:", e);
-            pw.print("error 处理异常");
             pw.flush();
             pw.close();
         }
diff --git a/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java b/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
index a663d55..e675369 100644
--- a/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
@@ -419,80 +419,76 @@
 
     //代付二
     private ServerResponse getObjectServerResponseTwo(Integer withId, HttpServletRequest request, HttpServletResponse response, UserWithdraw userWithdraw, User user, UserAssets userAssets) throws Exception {
+        String payoutUrl = "https://api.watchglb.com/pay/transfer";
+        String mchId = "100789033";
+        String key = "CZ5Q6NNI6D9YTCXZAIWIC8SAQCC35UZR";
+        String backUrl = "https://api.nalandacapital.mom/user/payoutCallback.do";
 
-        String payoutUrl = "https://gateway.kings-pays.com/gateway/payout/init";//正式地址
-        String merchantKey = "qqaC1DH/LeR9iPvm";//商户key 需替换
-        String aesKey = "ge6vK40fHNZPFJ4p";//商户aesKey 需替换
-        String aesIv = "6gJoHTEE1i2O3ovE";//商户aesIv 需替换
+        String bankCode = StringUtils.defaultIfBlank(userWithdraw.getBankAddress(), "").trim();
+        String receiveAccount = StringUtils.defaultIfBlank(userWithdraw.getBankNo(), "").trim();
+        String receiveName = StringUtils.defaultIfBlank(userWithdraw.getWithName(), user.getRealName());
+        receiveName = StringUtils.defaultIfBlank(receiveName, user.getNickName());
 
-        // 1. 生成商户订单号
+        if (StringUtils.isBlank(bankCode) || StringUtils.isBlank(receiveAccount) || StringUtils.isBlank(receiveName)) {
+            handleFailure(userAssets, userWithdraw, "Withdrawal failed:bank information incomplete");
+            return ServerResponse.createByErrorMsg("Incomplete bank card information", request);
+        }
+        if (userWithdraw.getWithAmt().stripTrailingZeros().scale() > 0) {
+            handleFailure(userAssets, userWithdraw, "Withdrawal failed:amount must be integer yuan");
+            return ServerResponse.createByErrorMsg("The amount must be an integer ", request);
+        }
+
         String merchantOrderNo = generatePayoutOrderId(withId);
+        String applyDate = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+        String transferAmount = userWithdraw.getWithAmt().toBigInteger().toString();
 
-        // 2. 构建加密前的业务参数
-        JSONObject dataObj = new JSONObject();
-        dataObj.put("amount", userWithdraw.getWithAmt().intValue()); // 注意金额单位(示例中为整数)
-        dataObj.put("transferType", "BANK_TRANSFER");
-        dataObj.put("beneficiaryName", user.getNickName());
-        dataObj.put("beneficiaryEmail", "null@gmail.com");
-        dataObj.put("beneficiaryPhoneNo", user.getPhone());
-        dataObj.put("beneficiaryAccount", userWithdraw.getBankNo());
-        dataObj.put("beneficiaryIFSC", userWithdraw.getBankAddress());
-        dataObj.put("merchantOrderNo", merchantOrderNo);
-        dataObj.put("notifyUrl", "https://api.greenbackcaps.top/user/payoutCallbackTwo.do");
+        Map<String, String> params = new HashMap<>();
+        params.put("sign_type", "MD5");
+        params.put("mch_id", mchId);
+        params.put("mch_transferId", merchantOrderNo);
+        params.put("transfer_amount", transferAmount);
+        params.put("apply_date", applyDate);
+        params.put("bank_code", bankCode);
+        params.put("receive_name", receiveName);
+        params.put("receive_account", receiveAccount);
+        params.put("back_url", backUrl);
+        if (StringUtils.isNotBlank(user.getPhone())) {
+            params.put("receiver_telephone", user.getPhone().trim());
+        }
 
-        // 3. AES 加密
-        String encryptedData = AesEncryptUtil.encrypt(dataObj.toJSONString(), aesKey, aesIv);
-        JSONObject requestObj = new JSONObject();
-        requestObj.put("data", encryptedData);
+        Map<String, String> signParams = new TreeMap<>();
+        for (Map.Entry<String, String> entry : params.entrySet()) {
+            if (!"sign".equals(entry.getKey()) && !"sign_type".equals(entry.getKey())
+                    && StringUtils.isNotBlank(entry.getValue())) {
+                signParams.put(entry.getKey(), entry.getValue());
+            }
+        }
+        String sign = PaymentSignUtil.generateSign(signParams, key);
+        params.put("sign", sign);
 
-        // 4. 设置请求头
-        Headers headers = new Headers.Builder()
-                .add("merchant_key", merchantKey)
-                .build();
+        log.info("watchglb代付请求参数:{}", params);
+        String respStr = HttpClientUtil.doPost(payoutUrl, params, "utf-8");
+        log.info("watchglb代付响应原始数据:{}", respStr);
 
-        // 5. 发送 HTTP 请求
-        log.info("代付请求参数:{}", requestObj.toJSONString());
-        String respStr = doPost(payoutUrl, requestObj.toJSONString(), headers);
-        log.info("代付响应原始数据:{}", respStr);
-
-        // 6. 解析响应(使用 Jackson 或 fastjson,这里以 fastjson 为例)
         JSONObject respJson = JSONObject.parseObject(respStr);
-        int code = respJson.getIntValue("code");
-        boolean success = respJson.getBooleanValue("success");
-        String msg = respJson.getString("msg");
-
-        // 6.1 接口调用失败(code != 0 或 success = false)
-        if (code != 0 || !success) {
-            handleFailure(userAssets, userWithdraw, "Failure? Please contact customer service.");
-            return ServerResponse.createByErrorMsg("代付请求失败:" + msg, request);
+        String respCode = respJson.getString("respCode");
+        String errorMsg = respJson.getString("errorMsg");
+        if (!"SUCCESS".equalsIgnoreCase(respCode)) {
+            String failMsg = StringUtils.defaultIfBlank(errorMsg, "unknown");
+            handleFailure(userAssets, userWithdraw, "Withdrawal failed:" + failMsg);
+            return ServerResponse.createByErrorMsg("" + failMsg, request);
         }
 
-        // 6.2 获取 data 部分
-        JSONObject data = respJson.getJSONObject("data");
-        String status = data.getString("status");       // ACCEPT / FAILURE / PROCESSING
-        String failMsg = data.getString("message");     // 失败时的具体原因
+        String platformOrderNo = StringUtils.defaultIfBlank(respJson.getString("tradeNo"), merchantOrderNo);
+        String respSign = respJson.getString("sign");
+        saveTransferRecordV2(merchantOrderNo, platformOrderNo, userWithdraw.getWithAmt(), user.getId(), withId, respSign);
 
-        // 7. 根据 status 判断业务是否成功
-        if ("ACCEPT".equals(status)) {
-            // 代付订单被接受(不一定最终成功,需等待回调)
-            String platformOrderNo = data.getString("orderNo");
+        userWithdraw.setWithStatus(4);
+        userWithdraw.setTransTime(new Date());
+        userWithdrawMapper.updateByPrimaryKeySelective(userWithdraw);
 
-            // 保存代付记录
-            saveTransferRecord(merchantOrderNo, platformOrderNo, userWithdraw.getWithAmt(), user.getId(), withId);
-
-            // 更新提现记录为“已提交”
-            userWithdraw.setWithStatus(4); // 4:已提交
-            userWithdraw.setTransTime(new Date());
-            userWithdrawMapper.updateByPrimaryKeySelective(userWithdraw);
-
-            log.info("代付下单成功,商户订单号:{}", merchantOrderNo);
-            return ServerResponse.createBySuccessMsg("代付申请已提交,请等待处理");
-        } else {
-            // 业务失败(如 FAILURE)
-            String errorMsg = (failMsg != null && !failMsg.isEmpty()) ? failMsg : msg;
-            handleFailure(userAssets, userWithdraw, "Withdrawal failed:" + errorMsg);
-            return ServerResponse.createByErrorMsg("Withdrawal failed:" + errorMsg, request);
-        }
+        log.info("watchglb代付下单成功,商户订单号:{},平台订单号:{}", merchantOrderNo, platformOrderNo);
+        return ServerResponse.createBySuccessMsg("代付申请已提交,请等待处理");
 
 
 
@@ -505,7 +501,7 @@
                                                         UserWithdraw userWithdraw, User user, UserAssets userAssets) throws Exception {
         String merchantOrderNo = generatePayoutOrderId(withId);
         BigDecimal amount = userWithdraw.getWithAmt().setScale(2, RoundingMode.HALF_UP);
-        String notifyUrl = "https://api.greenbackcaps.top/user/payoutCallbackThree.do";
+        String notifyUrl = "https://api.nalandacapital.mom/user/payoutCallbackThree.do";
 
         UserBank bank = userBankMapper.selectOne(new LambdaQueryWrapper<UserBank>()
                 .eq(UserBank::getUserId, user.getId())
@@ -750,7 +746,7 @@
             params.put("payout_mode", "INDIA_IMPS"); // 代付模式,根据实际情况选择
             params.put("customer_account_type", userWithdraw.getBankAddress()); // 账号类型
             params.put("customer_account_no", userWithdraw.getBankNo()); // 收款人账号(银行卡号或UPI ID)
-            params.put("notify_url", "https://api.greenbackcaps.top/user/payoutCallback.do"); // 异步通知地址
+            params.put("notify_url", "https://api.nalandacapital.mom/user/payoutCallback.do"); // 异步通知地址
             
             // 生成签名
             String sign = PaymentSignUtil.generateSign(params, key);

--
Gitblit v1.9.3