From 3cc94cc2d189e6ff55d657854599ad77ef8f6bf8 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期四, 05 九月 2024 15:47:29 +0800 Subject: [PATCH] 代码提交 --- ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java | 41 +++++++++++++++++++++++++++++++++-------- 1 files changed, 33 insertions(+), 8 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 efd2b30..bf56e36 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 @@ -2,19 +2,22 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.dto.ChargingOrderGroup; +import com.ruoyi.common.core.dto.ChargingPercentProvinceDto; import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.BasePage; import com.ruoyi.common.core.web.page.PageInfo; +import com.ruoyi.order.api.model.ChargingListQuery; import com.ruoyi.order.api.model.TChargingOrder; import com.ruoyi.order.api.model.TChargingOrderRefund; import com.ruoyi.order.api.query.ChargingOrderQuery; import com.ruoyi.order.api.query.UploadRealTimeMonitoringDataQuery; import com.ruoyi.order.api.vo.ChargingOrderTimeVO; -import com.ruoyi.order.api.vo.ChargingOrderVO; import com.ruoyi.order.api.vo.TCharingOrderVO; import com.ruoyi.order.dto.*; -import org.springframework.web.bind.annotation.RequestBody; +import com.ruoyi.order.vo.ChargingOrderListInfoVO; +import java.math.BigDecimal; +import java.time.LocalDate; import java.util.List; import java.util.Map; @@ -81,9 +84,9 @@ * @return */ AjaxResult chargingOrderStartupFailureWxRefund(String out_refund_no, String refund_id, String tradeState, String success_time); - - - + + + /** * 获取充电中的详情 * @param id @@ -105,9 +108,31 @@ R<PageInfo<TChargingOrderRefund>> getRefundList(ChargingRefundDto chargingRefundDto); + List<ChargingOrderGroup> chargingOrderGroup(ChargingPercentProvinceDto chargingPercentProvinceDto); + + List<SixChargingDto> charge(LocalDate sixBefore, List<Integer> siteIds); + + List<SixCircleDto> circle(List<Integer> siteIds,LocalDate sixBefore); + + Map<String, BigDecimal> countAll(LocalDate sixBefore); + + List<Map<String, BigDecimal>> getSumByType(List<Long> chargingOrderIds); + + List<Map<String, BigDecimal>> getDateData(List<Long> chargingOrderIds); + + List<Map<String, BigDecimal>> getWeekData(List<Long> chargingOrderIds); + + List<Map<String, BigDecimal>> getMonthData(List<Long> chargingOrderIds); + + List<Map<String, BigDecimal>> getYearData(List<Long> chargingOrderIds); + ChargingOrderTimeVO chargingList(ChargingListQuery dto); - - + + R payRefund(PayOrderRefundDto payOrderQueryDto); + + ChargingOrderListInfoVO chargingInfo(String uid); + + /** * 处理充电订单实时监控数据相关的业务逻辑 * @param query -- Gitblit v1.7.1