From 66794a3e6b3feb01d4b6ae5710a0725b525a99dd Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 08 十月 2024 15:13:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/ChargingOrderFallbackFactory.java | 40 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 39 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 f43eb6e..f51d11a 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
@@ -11,10 +11,12 @@
import com.ruoyi.order.api.query.UploadRealTimeMonitoringDataQuery;
import com.ruoyi.order.api.vo.ChargingBillVO;
import com.ruoyi.order.api.vo.GetChargingOrderByLicensePlate;
+import com.ruoyi.order.api.vo.SettlementTotalVO;
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;
@@ -32,6 +34,11 @@
public ChargingOrderClient create(Throwable throwable) {
log.error("充电订单调用失败:{}", throwable.getMessage());
return new ChargingOrderClient() {
+
+ @Override
+ public R<String> queryOrderByGunId(String id) {
+ return R.fail("远程调用根据枪id 查询最新的订单id 用户后台结束充电" + throwable.getMessage());
+ }
@Override
public R<Long> useOrderCount(Long userId) {
@@ -70,7 +77,7 @@
}
@Override
- public R<Long> getCar() {
+ public R<Long> getCar(@PathVariable("id")String id) {
return R.fail("获取用户最近使用车辆充电的车辆id:" + throwable.getMessage());
}
@@ -102,6 +109,37 @@
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());
+
+ }
};
}
}
--
Gitblit v1.7.1