From fd35f223b7f40ee9ee4a9307384b54a96d7956a2 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期四, 31 十月 2024 09:35:12 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java | 23 +++++++++++++++++++++-- 1 files changed, 21 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 5af0c8e..57b0caa 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 @@ -18,6 +18,7 @@ import com.ruoyi.order.dto.*; import com.ruoyi.order.vo.ChargingOrderListInfoVO; import com.ruoyi.order.vo.EndOfChargePageInfo; +import org.springframework.web.bind.annotation.RequestBody; import java.time.LocalDate; import java.util.List; @@ -170,7 +171,14 @@ * @param code */ void endCharge(String code, Integer endMode); - + + /** + * 停止充电返回账单后计算费用 + * @param vo + */ + void endChargeBillingCharge(TransactionRecordMessageVO vo); + + /** * 异常结束充电处理逻辑 @@ -190,6 +198,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(); @@ -204,7 +213,7 @@ Map<String, Object> countLocalCar(); - Long getAver(List<Integer> siteIds); + Double getAver(List<Integer> siteIds); List<Map<String, Object>> getLevelEvaluate(List<Integer> siteIds); @@ -258,4 +267,14 @@ * @return */ EndOfChargePageInfo getEndOfChargePageInfo(String id); + + Long countNoTag(); + + + /** + * 获取订单数据 + * @param order + * @return + */ + List<TChargingOrder> getChargingOrder(TChargingOrderVo order); } -- Gitblit v1.7.1