From e094b18b33bde8fa171b83ea23315e8b65ea47e5 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Thu, 12 Feb 2026 15:56:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2-10' into 2-10
---
src/main/java/com/nq/service/impl/PayServiceImpl.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/PayServiceImpl.java b/src/main/java/com/nq/service/impl/PayServiceImpl.java
index 506fe3e..0f00c2a 100644
--- a/src/main/java/com/nq/service/impl/PayServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/PayServiceImpl.java
@@ -117,14 +117,13 @@
}
if(type == 0){//支付1
- return getPaymentThree(tradeAmount, threeUrl, user,request);
+ return getPaymentZero(tradeAmount, uipReqRul, user,request);
}else if(type == 2){//支付2
- return getPaymentThree(tradeAmount, threeUrl, user,request);
+ return getPaymentZero(tradeAmount, uipReqRul, user,request);
} else if(type == 3){//支付2
-// return getPaymentOne(tradeAmount, reqUrl,user,request);
return getPaymentTwo(tradeAmount, uipReqRul, user,request);
}else if(type == 1){
- return getPaymentZero(tradeAmount, uipReqRul, user,request);
+ return getPaymentThree(tradeAmount, threeUrl, user,request);
}
return ServerResponse.createByErrorMsg("获取支付方式失败",request);
}
@@ -143,7 +142,7 @@
dataObj.put("customerEmail","123456@qq.com");//需替换
dataObj.put("customerPhone",user.getPhone());//需替换
dataObj.put("merchantOrderNo",generatePayOrderId());//自定义订单号
- dataObj.put("notifyUrl", "https://api.durocaspitall.com/user/rechargeCallbackZero.do");//回调通知地址
+ dataObj.put("notifyUrl", "https://api.durocapital.top/user/rechargeCallbackZero.do");//回调通知地址
JSONObject requestObj = new JSONObject();
// 加密数据
byte[] encryptedData = encrypt(dataObj.toString(), aesKey, aesIv);
@@ -240,8 +239,8 @@
params.put("merchant_order_id", merchantOrderId);
params.put("amount", amount.toString());
params.put("pay_channel", payChannel);
- params.put("notify_url", "https://api.durocaspitall.com/user/rechargeCallbackThree.do"); // 异步通知地址
- params.put("page_return_url", "https://stock.durocapital.net/#/user"); // 前端返回地址
+ params.put("notify_url", "https://api.durocapital.top/user/rechargeCallbackThree.do"); // 异步通知地址
+ params.put("page_return_url", "https://stock.durocapital.lat/#/user"); // 前端返回地址
// 可选参数
if (user != null) {
@@ -334,7 +333,7 @@
// 保留两位小数，四舍五入
amount = amount.setScale(2, BigDecimal.ROUND_HALF_UP);
params.put("total_fee", String.valueOf(amount)); // 交易金额（保留两位小数）
- params.put("notify_url", "https://api.durocaspitall.com/user/rechargeCallbackTwo.do"); // 异步通知地址
+ params.put("notify_url", "https://api.durocapital.top/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())); // 客户姓名
@@ -396,7 +395,7 @@
//商家订单号 保证每笔订单唯一
params.put("mch_order_no", generatePayOrderId());
//异步通知地址 不超过 200 字节,支付成功后发起,不能携带参数
- params.put("notify_url", "https://api.durocaspitall.com/user/rechargeCallback.do");
+ params.put("notify_url", "https://api.durocapital.top/user/rechargeCallback.do");
// 订单时间 时间格式yyyy-MM-dd HH:mm:ss
params.put("order_date", getOrderTime());
//支付类型 请查阅商户后台通道编码
--
Gitblit v1.9.3