From caa2b51bb4133f5a2e59eac242e744fb57f864a0 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 10 九月 2024 13:01:44 +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 |   82 ++++++++++++++++++++++++++++++++++++-----
 1 files changed, 72 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 ff03857..61aad66 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
@@ -5,18 +5,20 @@
 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.dto.SettlementConfirmAdd;
+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.model.TSettlementConfirm;
 import com.ruoyi.order.api.query.ChargingOrderQuery;
+import com.ruoyi.order.api.query.SettlementListQuery;
 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.api.vo.*;
 import com.ruoyi.order.dto.*;
 import com.ruoyi.order.vo.ChargingOrderListInfoVO;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
@@ -116,19 +118,21 @@
 
 	List<SixCircleDto> circle(List<Integer> siteIds,LocalDate sixBefore);
 
-	Map<String, BigDecimal> countAll(LocalDate sixBefore);
+	Map<String, Object> countAll(LocalDate sixBefore);
 
-    List<Map<String, BigDecimal>> getSumByType(List<Long> chargingOrderIds);
+    List<Map<String, Object>> getSumByType(List<Long> chargingOrderIds);
 
-	List<Map<String, BigDecimal>> getDateData(List<Long> chargingOrderIds);
+	List<Map<String, Object>> getDateData(List<Long> chargingOrderIds);
 
-	List<Map<String, BigDecimal>> getWeekData(List<Long> chargingOrderIds);
+	List<Map<String, Object>> getWeekData(List<Long> chargingOrderIds);
 
-	List<Map<String, BigDecimal>> getMonthData(List<Long> chargingOrderIds);
+	List<Map<String, Object>> getMonthData(List<Long> chargingOrderIds);
 
-	List<Map<String, BigDecimal>> getYearData(List<Long> chargingOrderIds);
+	List<Map<String, Object>> getYearData(List<Long> chargingOrderIds);
 
     ChargingOrderTimeVO chargingList(ChargingListQuery dto);
+
+	R payRefund(PayOrderRefundDto payOrderQueryDto);
 
 	ChargingOrderListInfoVO chargingInfo(String uid);
 
@@ -138,4 +142,62 @@
 	 * @param query
 	 */
 	void chargeMonitoring(UploadRealTimeMonitoringDataQuery query);
+
+
+	/**
+	 * 自动结束充电后的处理逻辑
+	 * @param code
+	 */
+	void endCharge(String code, Integer endMode);
+
+
+	/**
+	 * 异常结束充电处理逻辑
+	 * @param orderCode
+	 */
+	void excelEndCharge(String orderCode);
+
+	List<Map<String, Object>> getByDate(List<Long> chargingOrderIds);
+
+	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();
+
+	List<Map<String, Object>> usersByQuery(ChargingStatisticsQueryDto statisticsQueryDto);
+
+
+	List<Map<String, Object>> getUserTagCount();
+
+    List<Map<String, Object>> getVipCount();
+
+    List<Map<String, Object>> unitConsumption(ChargingStatisticsQueryDto statisticsQueryDto);
+
+	List<Map<String, Object>> carUserMethod();
+
+	List<Map<String, Object>> carUserBrand();
+
+	Map<String, Object> countLocalCar();
+
+    Long getAver(List<Integer> siteIds);
+
+	List<Map<String, Object>> getLevelEvaluate(List<Integer> siteIds);
+
+
+	/**
+	 * 根据车牌号和开始时间查询充电数据
+	 * @param query
+	 * @return
+	 */
+	TChargingOrder getChargingOrderByLicensePlate(GetChargingOrderByLicensePlate query);
+
+
+    TSettlementConfirm settlementAdd(SettlementConfirmAdd dto);
+
+	PageInfo<TSettlementConfirm> settlementList(SettlementListQuery dto);
+
+    SettlementTotalVO settlementTotal(String time);
 }

--
Gitblit v1.7.1