From bfb03f7b2a897a0be6143cbfd5484333904d263e Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 09 十月 2024 09:11:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/ChargingOrderFallbackFactory.java | 101 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 100 insertions(+), 1 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 ee6192f..15f974f 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
@@ -1,13 +1,22 @@
package com.ruoyi.order.api.factory;
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.feignClient.ChargingOrderClient;
+import com.ruoyi.order.api.model.ChargingListQuery;
import com.ruoyi.order.api.model.TChargingOrder;
+import com.ruoyi.order.api.model.TSettlementConfirm;
import com.ruoyi.order.api.query.TChargingCountQuery;
+import com.ruoyi.order.api.query.UploadRealTimeMonitoringDataQuery;
+import com.ruoyi.order.api.vo.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.cloud.openfeign.FallbackFactory;
import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.PathVariable;
+
+import java.util.List;
/**
* 充电订单服务降级处理
@@ -25,14 +34,34 @@
return new ChargingOrderClient() {
@Override
+ public R<String> queryOrderByGunId(String id) {
+ return R.fail("远程调用根据枪id 查询最新的订单id 用户后台结束充电" + throwable.getMessage());
+ }
+
+ @Override
public R<Long> useOrderCount(Long userId) {
return R.fail("订单计数:" + throwable.getMessage());
}
@Override
+ public R<ChargingBillVO> chargingBillListR(ChargingListQuery dto) {
+ return R.fail("查询充电算帐单失败" + throwable.getMessage());
+ }
+
+ @Override
public R<TChargingOrder> orderDetail(Long orderId) {
return R.fail("订单详情:" + throwable.getMessage());
+ }
+
+ @Override
+ public R<List<TChargingOrder>> getList(Integer siteId) {
+ return R.fail("根据站点id查询充电订单:" + throwable.getMessage());
+ }
+
+ @Override
+ public R<List<ChargingOrderGroup>> getBySiteIdAndTime(ChargingPercentProvinceDto chargingPercentProvinceDto) {
+ return null;
}
@Override
@@ -46,9 +75,79 @@
}
@Override
- public R<Long> getCar() {
+ public R<Long> getCar(@PathVariable("id")String id) {
return R.fail("获取用户最近使用车辆充电的车辆id:" + throwable.getMessage());
}
+
+ @Override
+ public void chargeMonitoring(UploadRealTimeMonitoringDataQuery query) {
+ }
+
+ @Override
+ 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());
+ }
+
+ @Override
+ public R<TSettlementConfirm> downloadSettlement(String uid) {
+ return R.fail("通过id查询结算确认失败:" + throwable.getMessage());
+ }
+
+ @Override
+ public R<SettlementTotalVO> settlementTotalR(String time) {
+ return R.fail("查询结算汇总表导出列表失败:" + throwable.getMessage());
+ }
+
+ @Override
+ public R<String> updateChargingOrder(TChargingOrder chargingOrder) {
+ return R.fail("修改充电订单失败:" + throwable.getMessage());
+ }
+
+ @Override
+ public R<String> stopCharging(String id) {
+ return R.fail("手动停止充电失败:" + throwable.getMessage());
+ }
+
+ @Override
+ public void chargingOrderWXCallback(String out_trade_no, String transaction_id, String attach) {
+ log.error("充电支付成功回调通知失败:" + throwable.getMessage());
+ }
+
+ @Override
+ public void chargingOrderStartupFailureWxRefund(String out_refund_no, String refund_id, String tradeState, String success_time) {
+ log.error("远程启动失败后退款通知失败:" + throwable.getMessage());
+ }
+
+ @Override
+ public void shoppingOrderWxRefund(String out_refund_no, String refund_id, String tradeState, String success_time) {
+ log.error("购物订单退款回调通知失败:" + throwable.getMessage());
+
+ }
+
+ @Override
+ public void securityDetection(SecurityDetection securityDetection) {
+ log.error("修改安全检测数据失败:" + throwable.getMessage());
+ }
+
+ @Override
+ public void startChargeSuccessfully(PlatformStartChargingReplyMessage message) {
+ log.error("远程启动充电应答失败:" + throwable.getMessage());
+ }
};
}
}
--
Gitblit v1.7.1