From f2a57f2a9fa309f872d10c7fada992b63a0c0d5f Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期日, 27 十月 2024 20:52:48 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile --- ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 deletions(-) diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java index d096708..705fae3 100644 --- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java +++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java @@ -17,6 +17,8 @@ import com.ruoyi.order.api.vo.*; import com.ruoyi.order.dto.*; import com.ruoyi.order.vo.ChargingOrderListInfoVO; +import com.ruoyi.order.vo.EndOfChargePageInfo; + import java.time.LocalDate; import java.util.List; import java.util.Map; @@ -168,7 +170,14 @@ * @param code */ void endCharge(String code, Integer endMode); - + + /** + * 停止充电返回账单后计算费用 + * @param vo + */ + void endChargeBillingCharge(TransactionRecordMessageVO vo); + + /** * 异常结束充电处理逻辑 @@ -188,6 +197,7 @@ List<Map<String, Object>> usersDay1(); List<Map<String, Object>> usersByQuery(ChargingStatisticsQueryDto statisticsQueryDto); + List<Map<String, Object>> usersByQuery1(ChargingStatisticsQueryDto statisticsQueryDto); List<Map<String, Object>> getUserTagCount(); @@ -202,7 +212,7 @@ Map<String, Object> countLocalCar(); - Long getAver(List<Integer> siteIds); + Double getAver(List<Integer> siteIds); List<Map<String, Object>> getLevelEvaluate(List<Integer> siteIds); @@ -248,4 +258,14 @@ List<Map<String, Object>> countAllUserData(); List<Map<String, Object>> needElec1(List<Integer> siteIds, ChargingStatisticsQueryDto statisticsQueryDto); + + + /** + * 获取充电结束页面详情 + * @param id + * @return + */ + EndOfChargePageInfo getEndOfChargePageInfo(String id); + + Long countNoTag(); } -- Gitblit v1.7.1