Merge remote-tracking branch 'origin/master'

puzhibing

2024-11-11 ae84ae528290f44c66ef14c92f4a68bd3c1ce617

 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());
            }
@@ -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());
            }
        };
    }
}