From 88ac2574d89aed7c28b9c0370b19b8bb2d0364eb Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 07 一月 2025 19:02:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/ChargingOrderFallbackFactory.java | 13 ++++++++++++-
1 files changed, 12 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 a6ff664..0062651 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
@@ -109,7 +109,7 @@
}
@Override
- public R<SettlementTotalVO> settlementTotalR(String time) {
+ public R<SettlementTotalVO> settlementTotalR(String time,Long userId) {
return R.fail("查询结算汇总表导出列表失败:" + throwable.getMessage());
}
@@ -125,6 +125,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());
}
@@ -163,6 +168,12 @@
public R<List<TChargingOrder>> getChargingOrder(TChargingOrderVo order) {
return R.fail("获取充电订单数据失败：" + throwable.getMessage());
}
+
+
+ @Override
+ public R<List<TChargingOrder>> getCarChargingOrder(Long carId, String startTime, String endTime) {
+ return R.fail("根据车辆id获取指定时间范围内的数据失败：" + throwable.getMessage());
+ }
};
}
}
--
Gitblit v1.7.1