From a2710eae94f1303434adfcdc3e23c5efaba151c5 Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期三, 06 十一月 2024 19:03:43 +0800 Subject: [PATCH] 合并代码 --- ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/ChargingOrderFallbackFactory.java | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 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 e4a99c5..2f6a4fa 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()); } @@ -158,6 +163,17 @@ public void endChargeBillingCharge(TransactionRecordMessageVO vo) { log.error("停止充电返回账单后计算费用处理失败:" + throwable.getMessage()); } + + @Override + 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