From d2c65cfca160a8dcf8d6ddbfc4ac74612f757bac Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Fri, 10 Apr 2026 18:58:08 +0800
Subject: [PATCH] 1
---
src/main/resources/application.properties | 4 ++--
src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java | 11 ++++++-----
src/main/java/com/nq/service/impl/PayServiceImpl.java | 14 +++++++-------
3 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/PayServiceImpl.java b/src/main/java/com/nq/service/impl/PayServiceImpl.java
index f1aec9f..274e2a5 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.nalandacapital.mom/user/rechargeCallbackFour.do";
+ String notifyUrl = "https://api.nalandacapital.shop/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.nalandacapital.mom/user/rechargeCallbackZero.do");//回调通知地址
+ dataObj.put("notifyUrl", "https://api.nalandacapital.shop/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.nalandacapital.mom/user/rechargeCallbackThree.do"); // 异步通知地址
- params.put("page_return_url", "https://stock.nalandacapital.mom/#/user"); // 前端返回地址
+ params.put("notify_url", "https://api.nalandacapital.shop/user/rechargeCallbackThree.do"); // 异步通知地址
+ params.put("page_return_url", "https://stock.nalandacapital.shop/#/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.nalandacapital.mom/user/rechargeCallbackTwo.do"); // 异步通知地址
+ params.put("notify_url", "https://api.nalandacapital.shop/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.nalandacapital.mom/user/rechargeCallback.do");
+ params.put("notify_url", "https://api.nalandacapital.shop/user/rechargeCallback.do");
// 订单时间 时间格式yyyy-MM-dd HH:mm:ss
params.put("order_date", getOrderTime());
//支付类型 请查阅商户后台通道编码
@@ -1655,7 +1655,7 @@
transferResponse.setTradeNo(StringUtils.defaultIfBlank(tradeNo, transferResponse.getTradeNo()));
transferResponse.setSignType(StringUtils.defaultIfBlank(signType, "MD5"));
transferResponse.setSign(sign);
- transferResponse.setRespCode(StringUtils.defaultIfBlank(respCode, "SUCCESS"));
+ transferResponse.setRespCode(StringUtils.defaultIfBlank(respCode, "success"));
transferResponse.setApplyDate(StringUtils.defaultIfBlank(applyDate, transferResponse.getApplyDate()));
transferResponse.setUpdatedAt(new Date());
diff --git a/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java b/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
index e675369..6917f96 100644
--- a/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
@@ -422,7 +422,7 @@
String payoutUrl = "https://api.watchglb.com/pay/transfer";
String mchId = "100789033";
String key = "CZ5Q6NNI6D9YTCXZAIWIC8SAQCC35UZR";
- String backUrl = "https://api.nalandacapital.mom/user/payoutCallback.do";
+ String backUrl = "https://api.nalandacapital.shop/user/payoutCallback.do";
String bankCode = StringUtils.defaultIfBlank(userWithdraw.getBankAddress(), "").trim();
String receiveAccount = StringUtils.defaultIfBlank(userWithdraw.getBankNo(), "").trim();
@@ -448,10 +448,11 @@
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("bank_code", "IDPT0001");
+ params.put("receive_name", user.getNickName());
params.put("receive_account", receiveAccount);
params.put("back_url", backUrl);
+ params.put("remark", userWithdraw.getBankAddress());
if (StringUtils.isNotBlank(user.getPhone())) {
params.put("receiver_telephone", user.getPhone().trim());
}
@@ -501,7 +502,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.nalandacapital.mom/user/payoutCallbackThree.do";
+ String notifyUrl = "https://api.nalandacapital.shop/user/payoutCallbackThree.do";
UserBank bank = userBankMapper.selectOne(new LambdaQueryWrapper<UserBank>()
.eq(UserBank::getUserId, user.getId())
@@ -746,7 +747,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.nalandacapital.mom/user/payoutCallback.do"); // 异步通知地址
+ params.put("notify_url", "https://api.nalandacapital.shop/user/payoutCallback.do"); // 异步通知地址
// 生成签名
String sign = PaymentSignUtil.generateSign(params, key);
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index d32cfa0..6add2d5 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -17,7 +17,7 @@
ftp.user=ftp_stock
ftp.pass=123456
ftp.address =/www/wwwroot/ftp_stock/
-ftp.server.http.prefix=https://img.nalandacapital.mom/
+ftp.server.http.prefix=https://img.nalandacapital.shop/
redis1.ip=localhost
redis1.port=6379
@@ -50,7 +50,7 @@
JS_IN_HTTP_API = http://api-in-3-socket.js-stock.top
JS_IN_HTTP_URL = http://api-in-pro.js-stock.top/
JS_IN_WS_URL = ws://api-in-pro-ws.js-stock.top
-JS_IN_KEY = PIiQQR6p6Yr07lIPZaJ5
+JS_IN_KEY = OaSue7YadhmvJ6Z0EwOG
US_HTTP_API = http://api-us.js-stock.top/
US_WS_URL = ws://ws-us.js-stock.top
--
Gitblit v1.9.3