From ab46a451cf1c94b01e8718e2aa6be6c7fc1886c1 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 16 八月 2024 15:32:50 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/ChargingOrderAccountingStrategyFallbackFactory.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/ChargingOrderAccountingStrategyFallbackFactory.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/ChargingOrderAccountingStrategyFallbackFactory.java
index 4abfb5e..7af99c0 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/ChargingOrderAccountingStrategyFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/ChargingOrderAccountingStrategyFallbackFactory.java
@@ -11,6 +11,7 @@
import java.util.List;
import java.util.Map;
+import java.util.Set;
/**
* 充电订单服务降级处理
@@ -26,15 +27,15 @@
public ChargingOrderAccountingStrategyClient create(Throwable throwable) {
log.error("充电订单调用失败:{}", throwable.getMessage());
return new ChargingOrderAccountingStrategyClient() {
-
-
+
+
@Override
- public R<List<List<Map<String, Object>>>> getTotalElectricQuantity(Integer days) {
+ public R<List<List<Map<String, Object>>>> getTotalElectricQuantity(Integer days, Set<Integer> siteIds) {
return R.fail("获取给定天数每天的充电量统计数据失败：" + throwable.getMessage());
}
-
+
@Override
- public R<List<Double>> getDailyChargingDegree(Integer days) {
+ public R<List<Double>> getDailyChargingDegree(Integer days, Set<Integer> siteIds) {
return R.fail("获取给定天数每天的充电度数失败：" + throwable.getMessage());
}
};
--
Gitblit v1.7.1