From f2dff53d76a7e9a23e6a2ecfed58ce978dc41442 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 06 九月 2024 18:22:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/factory/AccountingStrategyDetailFallbackFactory.java | 10 +++++-----
1 files changed, 5 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 9ffd23e..844dbb9 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
@@ -24,11 +24,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) {
@@ -44,6 +39,11 @@
public R<Boolean> checkChargingStrategy(CheckChargingStrategyDTO dto) {
return R.fail("校验充电桩计费模版是否准确失败：" + throwable.getMessage());
}
+
+ @Override
+ public R<List<TAccountingStrategyDetail>> getListByAccountingStrategyId(Integer id) {
+ throw new RuntimeException("根据计费策略主表id策略明细失败：" + throwable.getMessage());
+ }
@Override
public R<List<TAccountingStrategyDetail>> getDetailListByCode(String code) {
--
Gitblit v1.7.1