From a16c9bebf9ab97e04afa67db1665549af86948fb Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 07 二月 2025 17:02:30 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile

---
 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/ChargingOrderFallbackFactory.java |    9 +++++++--
 1 files changed, 7 insertions(+), 2 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 d2656dc..c95e71e 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
@@ -129,6 +129,11 @@
             }
     
             @Override
+            public void chargingOrderALICallback(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());
             }
@@ -155,8 +160,8 @@
             }
     
             @Override
-            public void endChargeBillingCharge(TransactionRecordMessageVO vo) {
-                log.error("停止充电返回账单后计算费用处理失败:" + throwable.getMessage());
+            public R endChargeBillingCharge(TransactionRecordMessageVO vo) {
+               return R.fail("停止充电返回账单后计算费用处理失败:" + throwable.getMessage());
             }
     
             @Override

--
Gitblit v1.7.1