From 7617d46abee2950b7336e3379f8c7a564939cb54 Mon Sep 17 00:00:00 2001
From: yanderong <307678080@qq.com>
Date: 星期六, 10 十月 2026 17:54:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.3' into 2.3
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/ChargingOrderFallbackFactory.java | 41 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 41 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 1bb738f..e36fa94 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,6 +4,7 @@
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.dto.DeviceStartChargingDTO;
import com.ruoyi.order.api.feignClient.ChargingOrderClient;
import com.ruoyi.order.api.model.AddTripartitePlatformOrder;
import com.ruoyi.order.api.model.ChargingListQuery;
@@ -96,6 +97,11 @@
@Override
public R<TChargingOrder> getOrderByCode(String code) {
return R.fail("通过流水号查询订单调用失败:" + throwable.getMessage());
+ }
+
+ @Override
+ public R<Boolean> updateHandshakeVin(String orderCode, String vin) {
+ return R.fail("写入订单握手VIN失败:" + throwable.getMessage());
}
@Override
@@ -223,6 +229,41 @@
public R<BigDecimal> getSumDegreeBySiteIds(@RequestParam("siteIds") List<Integer> SiteIds){
return R.fail("获取站点集合中总的充电量失败：" + throwable.getMessage());
}
+
+ @Override
+ public R<BigDecimal> getLargeScreenTotalCapacity(@RequestParam("siteIds") List<Integer> siteIds){
+ return R.fail("获取站点集合累计充电量失败：" + throwable.getMessage());
+ }
+
+ @Override
+ public R<List<Long>> getAppUserIdsBySiteIds(List<Integer> siteIds) {
+ return R.fail("查询站点充电用户失败：" + throwable.getMessage());
+ }
+
+ @Override
+ public R<List<VinChargingStatusVO>> getChargingVinStatus(List<Long> vinIds) {
+ return R.fail("查询VIN充电状态失败：" + throwable.getMessage());
+ }
+
+// @Override
+// public R<List<TChargingOrder>> getOrderListByStatus(List<Integer> statusList) {
+// return R.fail("获取站点集合中总的充电量失败：" + throwable.getMessage());
+// }
+
+ @Override
+ public R<Long> addChargingOrder(TChargingOrder chargingOrder) {
+ return R.fail("添加订单失败：" + throwable.getMessage());
+ }
+
+ @Override
+ public R<DeviceStartChargingVO> deviceStartCharging(DeviceStartChargingDTO dto) {
+ return R.fail("设备主动发起充电鉴权建单失败：" + throwable.getMessage());
+ }
+
+ @Override
+ public R<Integer> countActiveByCompany(Integer companyId) {
+ return R.fail("统计公司进行中充电订单失败：" + throwable.getMessage());
+ }
};
}
}
--
Gitblit v1.7.1