From d56e45a6bf3ad11809fbf51dff0dfbe853860d43 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期三, 19 三月 2025 20:56:33 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile --- ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/ChargingOrderFallbackFactory.java | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/ChargingOrderFallbackFactory.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/ChargingOrderFallbackFactory.java index 23c64cf..b1f6b08 100644 --- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/ChargingOrderFallbackFactory.java +++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/ChargingOrderFallbackFactory.java @@ -62,7 +62,7 @@ @Override public R<List<ChargingOrderGroup>> getBySiteIdAndTime(ChargingPercentProvinceDto chargingPercentProvinceDto) { - return null; + return R.fail("获取数据失败:" + throwable.getMessage()); } @Override @@ -166,8 +166,8 @@ } @Override - public void endChargeBillingCharge(TransactionRecordMessageVO vo) { - log.error("停止充电返回账单后计算费用处理失败:" + throwable.getMessage()); + public R endChargeBillingCharge(TransactionRecordMessageVO vo) { + return R.fail("停止充电返回账单后计算费用处理失败:" + throwable.getMessage()); } @Override @@ -182,6 +182,11 @@ } @Override + public R<List<TChargingOrder>> getCarChargingOrderByPlateNum(String plateNum, String startTime, String endTime) { + return R.fail("根据车牌号查询指定时间范围内的数据失败:" + throwable.getMessage()); + } + + @Override public R addTripartitePlatformOrder(AddTripartitePlatformOrder query) { return R.fail("添加三方平台充电订单数据失败:" + throwable.getMessage()); } @@ -191,6 +196,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) { -- Gitblit v1.7.1