From 951cd384e7b81eb7686e303f77992340cc91e6d1 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 10 九月 2024 09:49:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/factory/WxPaymentFallbackFactory.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/factory/WxPaymentFallbackFactory.java b/ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/factory/WxPaymentFallbackFactory.java
index 6761b58..6ed2018 100644
--- a/ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/factory/WxPaymentFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/factory/WxPaymentFallbackFactory.java
@@ -2,8 +2,10 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.payment.api.feignClient.WxPaymentClient;
+import com.ruoyi.payment.api.model.WxPaymentRefundModel;
import com.ruoyi.payment.api.vo.NotifyV3PayDecodeRespBody;
import com.ruoyi.payment.api.vo.PaymentOrder;
+import com.ruoyi.payment.api.vo.WxRefundNotifyResp;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.cloud.openfeign.FallbackFactory;
@@ -29,7 +31,7 @@
@Override
public R<NotifyV3PayDecodeRespBody> queryOrderInfo(String orderId) {
- return R.fail("查询支付订单信息失败：" + throwable.getMessage());
+ throw new RuntimeException("查询支付订单信息失败：" + throwable.getMessage());
}
@Override
@@ -49,7 +51,18 @@
@Override
public void close(String outTradeNo) {
+ throw new RuntimeException("关闭支付订单失败：" + throwable.getMessage());
+ }
+ @Override
+ public R<String> refundOrderR(WxPaymentRefundModel model) {
+ return R.fail("微信退款失败：" + throwable.getMessage());
+
+ }
+
+ @Override
+ public R<WxRefundNotifyResp> refundNotify(HttpServletRequest request) {
+ return R.fail("微信退款回调失败：" + throwable.getMessage());
}
};
}
--
Gitblit v1.7.1