From 0911582d2f80e7f3162fb6d0b59ee12e23de133b Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 17 十月 2024 09:39:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/wx/utils/WxV3Pay.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/wx/utils/WxV3Pay.java b/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/wx/utils/WxV3Pay.java
index af10ca3..e322861 100644
--- a/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/wx/utils/WxV3Pay.java
+++ b/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/wx/utils/WxV3Pay.java
@@ -132,7 +132,7 @@
.amount(WxPaymentInfoModel.Amount.builder().total(amount).build())
.payer(WxPaymentInfoModel.Payer.builder().openid(openid).build())
// 分不分账
- //.settle_info(WxPaymentInfoModel.SettleInfo.builder().profit_sharing(true).build())
+// .settle_info(WxPaymentInfoModel.SettleInfo.builder().profit_sharing(true).build())
.build();
// 封装基础数据
String reqBody = buildBaseParam(requestBody
@@ -191,7 +191,7 @@
*/
@Override
public Map<String, Object> refund(WxPaymentRefundModel refundModel) {
-// refundModel.setNotify_url(this.config.getV3().getNotifyRefundUrl());
+ refundModel.setNotify_url(this.config.getV3().getNotifyRefundUrl() + refundModel.getNotify_url());
return refund(this.httpClient, "/v3/refund/domestic/refunds", this.config.getHttpReadTimeoutMs(), this.config.getHttpConnectTimeoutMs(), refundModel);
}
--
Gitblit v1.7.1