From 54b50b89b9f083a892e954a8401a7203af87d4a2 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 24 九月 2024 13:40:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/factory/AccountingStrategyDetailFallbackFactory.java | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/factory/AccountingStrategyDetailFallbackFactory.java b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/factory/AccountingStrategyDetailFallbackFactory.java
index 2bf71a7..d8a1054 100644
--- a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/factory/AccountingStrategyDetailFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/factory/AccountingStrategyDetailFallbackFactory.java
@@ -4,10 +4,14 @@
import com.ruoyi.chargingPile.api.feignClient.AccountingStrategyDetailClient;
import com.ruoyi.chargingPile.api.model.TAccountingStrategyDetail;
import com.ruoyi.common.core.domain.R;
+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;
import org.springframework.stereotype.Component;
+
+import java.util.List;
/**
* @author zhibing.pu
@@ -22,11 +26,6 @@
public AccountingStrategyDetailClient create(Throwable throwable) {
log.error("计费策略调用失败:{}", throwable.getMessage());
return new AccountingStrategyDetailClient(){
-
- @Override
- public R<TAccountingStrategyDetail> getNowData(Integer accountingStrategyId) {
- return R.fail("获取当前有效的计费策略明细失败：" + throwable.getMessage());
- }
@Override
public R<TAccountingStrategyDetail> getDetailBySiteId(Integer siteId) {
@@ -42,6 +41,22 @@
public R<Boolean> checkChargingStrategy(CheckChargingStrategyDTO dto) {
return R.fail("校验充电桩计费模版是否准确失败：" + throwable.getMessage());
}
+
+ @Override
+ public R<List<TAccountingStrategyDetail>> getListByAccountingStrategyId(Integer id) {
+ // 手动进行全局事务回滚
+ try {
+ GlobalTransactionContext.getCurrent().rollback();
+ } catch (TransactionException e) {
+ throw new RuntimeException(e);
+ }
+ return R.fail("根据计费策略主表id策略明细失败：" + throwable.getMessage());
+ }
+
+ @Override
+ public R<List<TAccountingStrategyDetail>> getDetailListByCode(String code) {
+ return R.fail("通过桩编号查询当前使用的策略明细列表失败：" + throwable.getMessage());
+ }
};
}
}
--
Gitblit v1.7.1