From d7d6f86630ee5aefcfa1486b753a94394809fc65 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 01 十一月 2024 20:28:53 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/factory/AliPaymentFallbackFactory.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/factory/AliPaymentFallbackFactory.java b/ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/factory/AliPaymentFallbackFactory.java
index a552827..58d0545 100644
--- a/ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/factory/AliPaymentFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/factory/AliPaymentFallbackFactory.java
@@ -2,6 +2,8 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.payment.api.feignClient.AliPaymentClient;
+import com.ruoyi.payment.api.model.RefundReq;
+import com.ruoyi.payment.api.model.RefundResp;
import com.ruoyi.payment.api.vo.AliPaymentReq;
import com.ruoyi.payment.api.vo.AliPaymentResp;
import com.ruoyi.payment.api.vo.AliQueryOrder;
@@ -28,17 +30,22 @@
@Override
public R<AliPaymentResp> payment(AliPaymentReq req) {
- throw new RuntimeException("调起支付宝小程序支付失败：" + throwable.getMessage());
+ return R.fail("调起支付宝小程序支付失败：" + throwable.getMessage());
}
@Override
public R<AliQueryOrder> query(String outTradeNo) {
- throw new RuntimeException("查询支付订单失败：" + throwable.getMessage());
+ return R.fail("查询支付订单失败：" + throwable.getMessage());
}
@Override
public void close(String outTradeNo) {
- throw new RuntimeException("关闭支付订单失败：" + throwable.getMessage());
+ R.fail("关闭支付订单失败：" + throwable.getMessage());
+ }
+
+ @Override
+ public R<RefundResp> refund(RefundReq dto) {
+ return R.fail("支付宝退款失败：" + throwable.getMessage());
}
};
}
--
Gitblit v1.7.1