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 |   49 +++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 43 insertions(+), 6 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 6b2df64..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
@@ -17,10 +17,9 @@
 import com.ruoyi.order.api.vo.*;
 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 org.springframework.web.bind.annotation.RequestParam;
 
-import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.util.List;
 import java.util.Map;
@@ -83,14 +82,14 @@
 	 * 安全检测数据
 	 * @param securityDetection
 	 */
-	void securityDetection(SecurityDetection securityDetection);
+	void securityDetection(SecurityDetectionVO securityDetection);
 	
 	
 	/**
 	 * 启动充电应发
 	 * @param message
 	 */
-	void startChargeSuccessfully(PlatformStartChargingReplyMessage message);
+	void startChargeSuccessfully(PlatformStartChargingReplyMessageVO message);
 	
 	
 	/**
@@ -119,6 +118,15 @@
 	 * @return
 	 */
 	AjaxResult stopCharging(String id);
+	
+	
+	/**
+	 * 停止充电应答结果处理
+	 * @param platformStopChargingReply
+	 */
+	void terminateSuccessfulResponse(PlatformStopChargingReplyVO platformStopChargingReply);
+	
+	
 
 	TCharingOrderVO chargingOrder(ChargingOrderQuery dto);
 
@@ -163,7 +171,14 @@
 	 * @param code
 	 */
 	void endCharge(String code, Integer endMode);
-
+	
+	/**
+	 * 停止充电返回账单后计算费用
+	 * @param vo
+	 */
+	void endChargeBillingCharge(TransactionRecordMessageVO vo);
+	
+	
 
 	/**
 	 * 异常结束充电处理逻辑
@@ -180,8 +195,10 @@
 	List<Map<String, Object>> queryOrderCountAndMoneyBySiteIdDate(List<Integer> siteIds);
 
 	List<Map<String, Object>> usersDay();
+	List<Map<String, Object>> usersDay1();
 
 	List<Map<String, Object>> usersByQuery(ChargingStatisticsQueryDto statisticsQueryDto);
+	List<Map<String, Object>> usersByQuery1(ChargingStatisticsQueryDto statisticsQueryDto);
 
 
 	List<Map<String, Object>> getUserTagCount();
@@ -196,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);
 
@@ -240,4 +257,24 @@
 	List<Map<String, Object>> getchargingCapacity(List<Integer> siteIds, ChargingDetailQueryDto statisticsQueryDto);
 
 	List<Map<String, Object>> countAllUserData();
+
+	List<Map<String, Object>> needElec1(List<Integer> siteIds, ChargingStatisticsQueryDto statisticsQueryDto);
+	
+	
+	/**
+	 * 获取充电结束页面详情
+	 * @param id
+	 * @return
+	 */
+	EndOfChargePageInfo getEndOfChargePageInfo(String id);
+
+	Long countNoTag();
+	
+	
+	/**
+	 * 获取订单数据
+	 * @param order
+	 * @return
+	 */
+	List<TChargingOrder> getChargingOrder(TChargingOrderVo order);
 }

--
Gitblit v1.7.1