Merge remote-tracking branch 'origin/master'

xuhy

2025-01-07 88ac2574d89aed7c28b9c0370b19b8bb2d0364eb

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

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