From bd1e1c6a99c228ece8ece17be462b81d5494c7a1 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 24 六月 2025 21:01:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/ChargingOrderFallbackFactory.java | 14 +++++++++++++-
1 files changed, 13 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 6d50bbe..1bb738f 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
@@ -16,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;
/**
@@ -139,7 +142,12 @@
public void chargingOrderALICallback(String out_trade_no, String transaction_id, String attach) {
log.error("充电支付成功回调通知失败:" + throwable.getMessage());
}
-
+
+ @Override
+ public void chargingOrderALIH5Callback(String out_trade_no, String transaction_id, String attach) {
+ log.error("充电支付宝H5支付成功回调通知失败:" + throwable.getMessage());
+ }
+
@Override
public void chargingOrderStartupFailureWxRefund(String out_refund_no, String refund_id, String tradeState, String success_time) {
log.error("远程启动失败后退款通知失败:" + throwable.getMessage());
@@ -211,6 +219,10 @@
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