From 307ac5ff5f5f917f2eec2629449729e577b42dee Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期二, 03 六月 2025 09:29:05 +0800 Subject: [PATCH] 政务云 --- ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java | 49 +++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 39 insertions(+), 10 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 9689489..771d12c 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 @@ -15,11 +15,13 @@ import com.ruoyi.order.dto.*; import com.ruoyi.order.vo.ChargingOrderListInfoVO; import com.ruoyi.order.vo.EndOfChargePageInfo; +import com.ruoyi.order.vo.StatisticsOfBatteryVO; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; import java.math.BigDecimal; import java.time.LocalDate; +import java.time.LocalDateTime; import java.util.List; import java.util.Map; @@ -100,8 +102,17 @@ * @return */ AjaxResult chargingOrderStartupFailureWxRefund(String out_refund_no, String refund_id, String tradeState, String success_time); - - + + + /** + * 启动失败退款操作 + * @param code + */ + void refund(String code); + + + + void refund1(String code, BigDecimal money); /** * 获取充电中的详情 @@ -139,17 +150,17 @@ List<SixCircleDto> circle(List<Integer> siteIds,LocalDate sixBefore); - Map<String, Object> countAll(LocalDate sixBefore,List<Integer> siteIds); + Map<String, Object> countAll(List<Integer> siteIds); - List<Map<String, Object>> getSumByType(List<Long> chargingOrderIds); + List<Map<String, Object>> getSumByType(LocalDate start,LocalDate end,List<Integer> siteIds); - List<Map<String, Object>> getDateData(List<Long> chargingOrderIds); + List<Map<String, Object>> getDateData(LocalDate start,LocalDate end,List<Integer> siteIds); - List<Map<String, Object>> getWeekData(List<Long> chargingOrderIds); + List<Map<String, Object>> getWeekData(LocalDate start,LocalDate end,List<Integer> siteIds); - List<Map<String, Object>> getMonthData(List<Long> chargingOrderIds); + List<Map<String, Object>> getMonthData(LocalDate start,LocalDate end,List<Integer> siteIds); - List<Map<String, Object>> getYearData(List<Long> chargingOrderIds); + List<Map<String, Object>> getYearData(LocalDate start,LocalDate end,List<Integer> siteIds); ChargingOrderTimeVO chargingList(ChargingListQuery dto); @@ -185,13 +196,12 @@ */ void excelEndCharge(String orderCode); - List<Map<String, Object>> getByDate(List<Long> chargingOrderIds); + List<Map<String, Object>> getByDate(LocalDate start,LocalDate end, List<Integer> siteIds); List<Map<String, Object>> queryPower(List<Integer> siteIds); Map<String, Object> qureryPowerLevel(List<Integer> siteIds, ChargingStatisticsQueryDto statisticsQueryDto); - List<Map<String, Object>> queryOrderCountAndMoneyBySiteIdDate(List<Integer> siteIds); List<Map<String, Object>> usersDay(ChargingStatisticsQueryDto statisticsQueryDto); List<Map<String, Object>> usersDay1(); @@ -301,4 +311,23 @@ * @return */ R getNotPaymentChargingOrder(); + + + /** + * + * 手动推送订单给第三方平台 + * @param code + * @return + */ + R pushOrderInfo(String code); + + + R addChargingOrderSummaryData(); + + /** + * 大屏-新能源汽车电池安全检测次数统计 + */ + R<StatisticsOfBatteryVO> getStatisticsOfBattery(); + + BigDecimal getSumDegreeBySiteIds(List<Integer> siteIds); } -- Gitblit v1.7.1