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;
@@ -62,7 +63,7 @@

            @Override
            public R<List<ChargingOrderGroup>> getBySiteIdAndTime(ChargingPercentProvinceDto chargingPercentProvinceDto) {
                return null;
                return R.fail("获取数据失败：" + throwable.getMessage());
            }
    
            @Override
@@ -166,19 +167,29 @@
            }
    
            @Override
            public void endChargeBillingCharge(TransactionRecordMessageVO vo) {
                log.error("停止充电返回账单后计算费用处理失败:" + throwable.getMessage());
            public R endChargeBillingCharge(TransactionRecordMessageVO vo) {
               return R.fail("停止充电返回账单后计算费用处理失败:" + throwable.getMessage());
            }
    
            @Override
            public R<List<TChargingOrder>> getChargingOrder(TChargingOrderVo order) {
                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) {
                return R.fail("根据车辆id获取指定时间范围内的数据失败：" + throwable.getMessage());
            }
    
            @Override
            public R<List<TChargingOrder>> getCarChargingOrderByPlateNum(String plateNum, String startTime, String endTime) {
                return R.fail("根据车牌号查询指定时间范围内的数据失败：" + throwable.getMessage());
            }
    
            @Override
@@ -191,6 +202,10 @@
                return R.fail("根据三方平台订单id获取充电数据失败：" + throwable.getMessage());
            }
    
            @Override
            public R<List<TChargingOrder>> getChargingOrderByStartChargeSeqs(List<String> startChargeSeqs) {
                return R.fail("根据三方平台订单ids获取充电数据失败" + throwable.getMessage());
            }
    
            @Override
            public R tripartitePlatformStopCharge(String startChargeSeq) {