From abd914abdee5831b04b6d76d04bd1a50534fa68c Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 06 五月 2025 16:51:18 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile into dev

---
 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/ChargingOrderFallbackFactory.java |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/ChargingOrderFallbackFactory.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/ChargingOrderFallbackFactory.java
index 6756519..6d50bbe 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/ChargingOrderFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/ChargingOrderFallbackFactory.java
@@ -3,6 +3,7 @@
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.dto.ChargingOrderGroup;
 import com.ruoyi.common.core.dto.ChargingPercentProvinceDto;
+import com.ruoyi.order.api.dto.ChargingStatisticeDTO;
 import com.ruoyi.order.api.feignClient.ChargingOrderClient;
 import com.ruoyi.order.api.model.AddTripartitePlatformOrder;
 import com.ruoyi.order.api.model.ChargingListQuery;
@@ -62,7 +63,7 @@
 
             @Override
             public R<List<ChargingOrderGroup>> getBySiteIdAndTime(ChargingPercentProvinceDto chargingPercentProvinceDto) {
-                return null;
+                return R.fail("获取数据失败:" + throwable.getMessage());
             }
     
             @Override
@@ -174,8 +175,13 @@
             public R<List<TChargingOrder>> getChargingOrder(TChargingOrderVo order) {
                 return R.fail("获取充电订单数据失败:" + throwable.getMessage());
             }
-    
-    
+
+            @Override
+            public R<List<TChargingOrder>> getChargingStatistics(ChargingStatisticeDTO dto) {
+                return R.fail("获取充电订单数据失败-监管:" + throwable.getMessage());
+            }
+
+
             @Override
             public R<List<TChargingOrder>> getCarChargingOrder(Long carId, String startTime, String endTime) {
                 return R.fail("根据车辆id获取指定时间范围内的数据失败:" + throwable.getMessage());

--
Gitblit v1.7.1