From 3b0a898df3cafe2c876d20b5bf9dd0f1734acc81 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 02 九月 2024 10:49:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 48 insertions(+), 0 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 abf4b75..ff03857 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,17 +2,24 @@
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.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 com.ruoyi.order.vo.ChargingOrderListInfoVO;
import org.springframework.web.bind.annotation.RequestBody;
+import java.math.BigDecimal;
+import java.time.LocalDate;
import java.util.List;
import java.util.Map;
@@ -71,6 +78,18 @@
/**
+ * 充电启动失败后的退款回调处理
+ * @param out_refund_no
+ * @param refund_id
+ * @param tradeState
+ * @param success_time
+ * @return
+ */
+ AjaxResult chargingOrderStartupFailureWxRefund(String out_refund_no, String refund_id, String tradeState, String success_time);
+
+
+
+ /**
* 获取充电中的详情
* @param id
* @return
@@ -90,4 +109,33 @@
R<PageInfo<PayOrderDto>> payOrderQuery(PayOrderQueryDto payOrderQueryDto);
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);
+
+ ChargingOrderListInfoVO chargingInfo(String uid);
+
+
+ /**
+ * 处理充电订单实时监控数据相关的业务逻辑
+ * @param query
+ */
+ void chargeMonitoring(UploadRealTimeMonitoringDataQuery query);
}
--
Gitblit v1.7.1