Merge remote-tracking branch 'origin/master'

xuhy

2025-03-26 ccd1837ee6016e0b72557f98ea45fc2e4f152ae1

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/ChargingOrderFallbackFactory.java

@@ -3,6 +3,7 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.dto.ChargingOrderGroup;
import com.ruoyi.common.core.dto.ChargingPercentProvinceDto;
import com.ruoyi.order.api.dto.ChargingStatisticeDTO;
import com.ruoyi.order.api.feignClient.ChargingOrderClient;
import com.ruoyi.order.api.model.AddTripartitePlatformOrder;
import com.ruoyi.order.api.model.ChargingListQuery;
@@ -175,6 +176,11 @@
                return R.fail("获取充电订单数据失败：" + throwable.getMessage());
            }
    
            @Override
            public R<List<TChargingOrder>> getChargingStatistics(ChargingStatisticeDTO dto) {
                return R.fail("获取充电订单数据失败-监管：" + throwable.getMessage());
            }

    
            @Override
            public R<List<TChargingOrder>> getCarChargingOrder(Long carId, String startTime, String endTime) {