From be5bf06cb3d9142f4be9edb3885769a55bd2db71 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Thu, 21 May 2026 18:36:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2-10' into 2-10
---
src/main/resources/application.properties | 2 +-
src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java | 6 +++---
src/main/java/com/nq/service/impl/PayServiceImpl.java | 12 ++++++------
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/PayServiceImpl.java b/src/main/java/com/nq/service/impl/PayServiceImpl.java
index ce8ea6f..63652f6 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.cyou/user/rechargeCallbackFour.do";
+ String notifyUrl = "https://api.nalandacapital.icu/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.cyou/user/rechargeCallbackZero.do");//回调通知地址
+ dataObj.put("notifyUrl", "https://api.nalandacapital.icu/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.cyou/user/rechargeCallbackThree.do"); // 异步通知地址
- params.put("page_return_url", "https://stock.nalandacapital.bond/#/user"); // 前端返回地址
+ params.put("notify_url", "https://api.nalandacapital.icu/user/rechargeCallbackThree.do"); // 异步通知地址
+ params.put("page_return_url", "https://stock.nalandacapital.lat/#/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.cyou/user/rechargeCallbackTwo.do"); // 异步通知地址
+ params.put("notify_url", "https://api.nalandacapital.icu/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.cyou/user/rechargeCallback.do");
+ params.put("notify_url", "https://api.nalandacapital.icu/user/rechargeCallback.do");
// 订单时间 时间格式yyyy-MM-dd HH:mm:ss
params.put("order_date", getOrderTime());
//支付类型 请查阅商户后台通道编码
diff --git a/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java b/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
index 87ba432..0e6ce75 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.cyou/user/payoutCallback.do";
+ String backUrl = "https://api.nalandacapital.icu/user/payoutCallback.do";
String bankCode = StringUtils.defaultIfBlank(userWithdraw.getBankAddress(), "").trim();
String receiveAccount = StringUtils.defaultIfBlank(userWithdraw.getBankNo(), "").trim();
@@ -502,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.cyou/user/payoutCallbackThree.do";
+ String notifyUrl = "https://api.nalandacapital.icu/user/payoutCallbackThree.do";
UserBank bank = userBankMapper.selectOne(new LambdaQueryWrapper<UserBank>()
.eq(UserBank::getUserId, user.getId())
@@ -747,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.cyou/user/payoutCallback.do"); // 异步通知地址
+ params.put("notify_url", "https://api.nalandacapital.icu/user/payoutCallback.do"); // 异步通知地址
// 生成签名
String sign = PaymentSignUtil.generateSign(params, key);
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 47de75c..7ed4106 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.cyou/
+ftp.server.http.prefix=https://img.nalandacapital.icu/
redis1.ip=localhost
redis1.port=6379
--
Gitblit v1.9.3