From 73be7ff2317fea8194b7a6dc0452b64a511c7836 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 06 十一月 2024 18:42:38 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/ali/v2/AppletPayUtil.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/ali/v2/AppletPayUtil.java b/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/ali/v2/AppletPayUtil.java
index c116fdc..e4dc7b4 100644
--- a/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/ali/v2/AppletPayUtil.java
+++ b/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/ali/v2/AppletPayUtil.java
@@ -9,7 +9,7 @@
import com.alipay.api.response.*;
import com.ruoyi.payment.ali.config.AliProperties;
import com.ruoyi.payment.ali.config.SignType;
-import com.ruoyi.payment.ali.v2.model.*;
+import com.ruoyi.payment.api.model.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
@@ -60,10 +60,11 @@
//异步返回参数
model.setPassbackParams(pojo.getPassbackParams());
request.setBizModel(model);
+ request.setNotifyUrl(aliProperties.getNotifyUrl() + pojo.getNotifyUrl());
AlipayTradeCreateResponse response = alipayClient.execute(request);
log.info("-----调起支付宝支付-----");
- log.info("请求参数：{}", pojo);
+ log.info("请求参数：{}", JSON.toJSONString(request));
log.info("返回结果：{}", response.getBody());
if (response.isSuccess()) {
return PaymentResp.build(response.getOutTradeNo(), response.getTradeNo());
@@ -207,12 +208,12 @@
alipayConfig.setSignType(SignType.RSA2.getType());
//判断加签方式
String signType = aliProperties.getSignType();
- if(SignType.CERT.getType().equals(signType)){
+ if(SignType.SECRET_KEY.getType().equals(signType)){
alipayConfig.setPrivateKey(aliProperties.getPrivateKey());
alipayConfig.setAlipayPublicKey(aliProperties.getAlipayPublicKey());
return alipayConfig;
}
- if(SignType.SECRET_KEY.getType().equals(signType)){
+ if(SignType.CERT.getType().equals(signType)){
alipayConfig.setAppCertPath(aliProperties.getAppCertPath());
alipayConfig.setAlipayPublicCertPath(aliProperties.getAlipayPublicCertPath());
alipayConfig.setRootCertPath(aliProperties.getRootCertPath());
--
Gitblit v1.7.1