From 71e051cddfba05a4e7876a92650cc8d7b5fabf28 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期五, 23 五月 2025 20:59:58 +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 | 65 ++++++++++++++++++++++++++++++--
1 files changed, 60 insertions(+), 5 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 a6ff664..cd782a1 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,7 +3,9 @@
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;
import com.ruoyi.order.api.model.TChargingOrder;
import com.ruoyi.order.api.model.TSettlementConfirm;
@@ -14,8 +16,11 @@
import org.slf4j.LoggerFactory;
import org.springframework.cloud.openfeign.FallbackFactory;
import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestParam;
+import java.math.BigDecimal;
import java.util.List;
/**
@@ -61,9 +66,14 @@
@Override
public R<List<ChargingOrderGroup>> getBySiteIdAndTime(ChargingPercentProvinceDto chargingPercentProvinceDto) {
- return null;
+ return R.fail("获取数据失败：" + throwable.getMessage());
}
-
+
+ @Override
+ public R<List<TChargingOrder>> getOrderBySiteIdAndTime(ChargingPercentProvinceDto chargingPercentProvinceDto) {
+ return R.fail("根据站点id和时间区间查询订单数据失败：" + throwable.getMessage());
+ }
+
@Override
public R<Integer> getChargingCount(TChargingCountQuery req) {
return R.fail("根据会员id和有效期查询有效期内享受充电折扣次数:" + throwable.getMessage());
@@ -109,7 +119,7 @@
}
@Override
- public R<SettlementTotalVO> settlementTotalR(String time) {
+ public R<SettlementTotalVO> settlementTotalR(String time,Long userId) {
return R.fail("查询结算汇总表导出列表失败:" + throwable.getMessage());
}
@@ -125,6 +135,11 @@
@Override
public void chargingOrderWXCallback(String out_trade_no, String transaction_id, String attach) {
+ log.error("充电支付成功回调通知失败:" + throwable.getMessage());
+ }
+
+ @Override
+ public void chargingOrderALICallback(String out_trade_no, String transaction_id, String attach) {
log.error("充电支付成功回调通知失败:" + throwable.getMessage());
}
@@ -155,14 +170,54 @@
}
@Override
- public void endChargeBillingCharge(TransactionRecordMessageVO vo) {
- log.error("停止充电返回账单后计算费用处理失败:" + throwable.getMessage());
+ public R endChargeBillingCharge(TransactionRecordMessageVO vo) {
+ return R.fail("停止充电返回账单后计算费用处理失败:" + throwable.getMessage());
}
@Override
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());
+ }
+
+ @Override
+ public R<List<TChargingOrder>> getCarChargingOrderByPlateNum(String plateNum, String startTime, String endTime) {
+ return R.fail("根据车牌号查询指定时间范围内的数据失败：" + throwable.getMessage());
+ }
+
+ @Override
+ public R addTripartitePlatformOrder(AddTripartitePlatformOrder query) {
+ return R.fail("添加三方平台充电订单数据失败：" + throwable.getMessage());
+ }
+
+ @Override
+ public R<TChargingOrder> getChargingOrderByStartChargeSeq(String startChargeSeq) {
+ return R.fail("根据三方平台订单id获取充电数据失败：" + throwable.getMessage());
+ }
+
+ @Override
+ public R<List<TChargingOrder>> getChargingOrderByStartChargeSeqs(List<String> startChargeSeqs) {
+ return R.fail("根据三方平台订单ids获取充电数据失败" + throwable.getMessage());
+ }
+
+ @Override
+ public R tripartitePlatformStopCharge(String startChargeSeq) {
+ return R.fail("三方平台请求停止充电失败：" + throwable.getMessage());
+ }
+ @Override
+ public R<BigDecimal> getSumDegreeBySiteIds(@RequestParam("siteIds") List<Integer> SiteIds){
+ return R.fail("获取站点集合中总的充电量失败：" + throwable.getMessage());
+ }
};
}
}
--
Gitblit v1.7.1