From 8ada6986f6a45c22783f5a55d030baf8778adb5b Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 06 十一月 2024 18:38:54 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile

---
 ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/factory/WxPaymentFallbackFactory.java |   19 ++++++++-----------
 1 files changed, 8 insertions(+), 11 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..763ea46 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;
@@ -34,22 +36,17 @@
     
             @Override
             public R<Map<String, Object>> orderPay(PaymentOrder paymentOrder) {
-                throw new RuntimeException("调起微信支付失败:" + throwable.getMessage());
-            }
-    
-            @Override
-            public R<Map<String, Object>> payNotify(HttpServletRequest request) {
-                return R.fail("微信支付回调失败:" + throwable.getMessage());
-            }
-    
-            @Override
-            public void ack() {
-        
+                return R.fail("调起微信支付失败:" + throwable.getMessage());
             }
 
             @Override
             public void close(String outTradeNo) {
+                R.fail("关闭支付订单失败:" + throwable.getMessage());
+            }
 
+            @Override
+            public R<String> refundOrderR(WxPaymentRefundModel model) {
+                return R.fail("微信退款失败:" + throwable.getMessage());
             }
         };
     }

--
Gitblit v1.7.1