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-order/src/main/java/com/ruoyi/order/api/factory/ChargingOrderFallbackFactory.java |   23 +++++++++++++++++++++++
 1 files changed, 23 insertions(+), 0 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 64b0022..cb89711 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
@@ -4,9 +4,12 @@
 import com.ruoyi.common.core.dto.ChargingOrderGroup;
 import com.ruoyi.common.core.dto.ChargingPercentProvinceDto;
 import com.ruoyi.order.api.feignClient.ChargingOrderClient;
+import com.ruoyi.order.api.model.ChargingListQuery;
 import com.ruoyi.order.api.model.TChargingOrder;
 import com.ruoyi.order.api.query.TChargingCountQuery;
 import com.ruoyi.order.api.query.UploadRealTimeMonitoringDataQuery;
+import com.ruoyi.order.api.vo.ChargingBillVO;
+import com.ruoyi.order.api.vo.GetChargingOrderByLicensePlate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.cloud.openfeign.FallbackFactory;
@@ -33,6 +36,11 @@
             public R<Long> useOrderCount(Long userId) {
                 return R.fail("订单计数:" + throwable.getMessage());
 
+            }
+
+            @Override
+            public R<ChargingBillVO> chargingBillListR(ChargingListQuery dto) {
+                return R.fail("查询充电算帐单失败" + throwable.getMessage());
             }
 
             @Override
@@ -73,6 +81,21 @@
             public R<TChargingOrder> getOrderByCode(String code) {
                 return R.fail("通过流水号查询订单调用失败:" + throwable.getMessage());
             }
+    
+            @Override
+            public void endCharge(String code) {
+        
+            }
+    
+            @Override
+            public void excelEndCharge(String code) {
+        
+            }
+    
+            @Override
+            public R<TChargingOrder> getChargingOrderByLicensePlate(GetChargingOrderByLicensePlate query) {
+                return R.fail("根据车牌号和时间查询有效的充电数据失败:" + throwable.getMessage());
+            }
         };
     }
 }

--
Gitblit v1.7.1