From c4664502dfdaffff555b532e65b51a57ac8b29c2 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 16 十月 2024 17:51:32 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/factory/WxPaymentFallbackFactory.java | 41 -----------------------------------------
1 files changed, 0 insertions(+), 41 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 bab0b46..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
@@ -6,8 +6,6 @@
import com.ruoyi.payment.api.vo.NotifyV3PayDecodeRespBody;
import com.ruoyi.payment.api.vo.PaymentOrder;
import com.ruoyi.payment.api.vo.WxRefundNotifyResp;
-import io.seata.core.exception.TransactionException;
-import io.seata.tm.api.GlobalTransactionContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.cloud.openfeign.FallbackFactory;
@@ -33,61 +31,22 @@
@Override
public R<NotifyV3PayDecodeRespBody> queryOrderInfo(String orderId) {
- // 手动进行全局事务回滚
- try {
- GlobalTransactionContext.getCurrent().rollback();
- } catch (TransactionException e) {
- throw new RuntimeException(e);
- }
return R.fail("查询支付订单信息失败：" + throwable.getMessage());
}
@Override
public R<Map<String, Object>> orderPay(PaymentOrder paymentOrder) {
- // 手动进行全局事务回滚
- try {
- GlobalTransactionContext.getCurrent().rollback();
- } catch (TransactionException e) {
- throw new RuntimeException(e);
- }
return R.fail("调起微信支付失败：" + throwable.getMessage());
- }
-
- @Override
- public R<Map<String, Object>> payNotify(HttpServletRequest request) {
- return R.fail("微信支付回调失败：" + throwable.getMessage());
- }
-
- @Override
- public void ack() {
-
}
@Override
public void close(String outTradeNo) {
- // 手动进行全局事务回滚
- try {
- GlobalTransactionContext.getCurrent().rollback();
- } catch (TransactionException e) {
- throw new RuntimeException(e);
- }
R.fail("关闭支付订单失败：" + throwable.getMessage());
}
@Override
public R<String> refundOrderR(WxPaymentRefundModel model) {
- // 手动进行全局事务回滚
- try {
- GlobalTransactionContext.getCurrent().rollback();
- } catch (TransactionException e) {
- throw new RuntimeException(e);
- }
return R.fail("微信退款失败：" + throwable.getMessage());
- }
-
- @Override
- public R<WxRefundNotifyResp> refundNotify(HttpServletRequest request) {
- return R.fail("微信退款回调失败：" + throwable.getMessage());
}
};
}
--
Gitblit v1.7.1