From f2dff53d76a7e9a23e6a2ecfed58ce978dc41442 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 06 九月 2024 18:22:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java |   27 +++++++++++++++++++++++++++
 1 files changed, 27 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 bf56e36..f7da0dc 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
@@ -12,9 +12,13 @@
 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.GetChargingOrderByLicensePlate;
 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 org.springframework.web.bind.annotation.RequestParam;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
@@ -138,4 +142,27 @@
 	 * @param query
 	 */
 	void chargeMonitoring(UploadRealTimeMonitoringDataQuery query);
+
+
+	/**
+	 * 自动结束充电后的处理逻辑
+	 * @param code
+	 */
+	void endCharge(String code, Integer endMode);
+
+
+	/**
+	 * 异常结束充电处理逻辑
+	 * @param orderCode
+	 */
+	void excelEndCharge(String orderCode);
+	
+	
+	/**
+	 * 根据车牌号和开始时间查询充电数据
+	 * @param query
+	 * @return
+	 */
+	TChargingOrder getChargingOrderByLicensePlate(GetChargingOrderByLicensePlate query);
+	
 }

--
Gitblit v1.7.1