From bcff6cd41a09c5b3f5db68db8b9dbb2f90fb78f3 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 28 十月 2024 11:11:15 +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, 44 insertions(+), 5 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 dfd86b8..705fae3 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,8 @@
 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 com.ruoyi.order.vo.EndOfChargePageInfo;
 
-import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.util.List;
 import java.util.Map;
@@ -80,6 +78,20 @@
 	
 	
 	/**
+	 * 安全检测数据
+	 * @param securityDetection
+	 */
+	void securityDetection(SecurityDetectionVO securityDetection);
+	
+	
+	/**
+	 * 启动充电应发
+	 * @param message
+	 */
+	void startChargeSuccessfully(PlatformStartChargingReplyMessageVO message);
+	
+	
+	/**
 	 * 充电启动失败后的退款回调处理
 	 * @param out_refund_no
 	 * @param refund_id
@@ -105,6 +117,15 @@
 	 * @return
 	 */
 	AjaxResult stopCharging(String id);
+	
+	
+	/**
+	 * 停止充电应答结果处理
+	 * @param platformStopChargingReply
+	 */
+	void terminateSuccessfulResponse(PlatformStopChargingReplyVO platformStopChargingReply);
+	
+	
 
 	TCharingOrderVO chargingOrder(ChargingOrderQuery dto);
 
@@ -149,7 +170,14 @@
 	 * @param code
 	 */
 	void endCharge(String code, Integer endMode);
-
+	
+	/**
+	 * 停止充电返回账单后计算费用
+	 * @param vo
+	 */
+	void endChargeBillingCharge(TransactionRecordMessageVO vo);
+	
+	
 
 	/**
 	 * 异常结束充电处理逻辑
@@ -169,6 +197,7 @@
 	List<Map<String, Object>> usersDay1();
 
 	List<Map<String, Object>> usersByQuery(ChargingStatisticsQueryDto statisticsQueryDto);
+	List<Map<String, Object>> usersByQuery1(ChargingStatisticsQueryDto statisticsQueryDto);
 
 
 	List<Map<String, Object>> getUserTagCount();
@@ -183,7 +212,7 @@
 
 	Map<String, Object> countLocalCar();
 
-    Long getAver(List<Integer> siteIds);
+    Double getAver(List<Integer> siteIds);
 
 	List<Map<String, Object>> getLevelEvaluate(List<Integer> siteIds);
 
@@ -229,4 +258,14 @@
 	List<Map<String, Object>> countAllUserData();
 
 	List<Map<String, Object>> needElec1(List<Integer> siteIds, ChargingStatisticsQueryDto statisticsQueryDto);
+	
+	
+	/**
+	 * 获取充电结束页面详情
+	 * @param id
+	 * @return
+	 */
+	EndOfChargePageInfo getEndOfChargePageInfo(String id);
+
+	Long countNoTag();
 }

--
Gitblit v1.7.1