Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charg...

无关风月

2025-02-07 a16c9bebf9ab97e04afa67db1665549af86948fb

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

@@ -160,8 +160,8 @@
            }
    
            @Override
            public void endChargeBillingCharge(TransactionRecordMessageVO vo) {
                log.error("停止充电返回账单后计算费用处理失败:" + throwable.getMessage());
            public R endChargeBillingCharge(TransactionRecordMessageVO vo) {
               return R.fail("停止充电返回账单后计算费用处理失败:" + throwable.getMessage());
            }
    
            @Override