From f26e03a3ca5dc60711a27adc64c46f73a569b02f Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 09 九月 2024 14:05:34 +0800
Subject: [PATCH] 代码提交

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java |   30 ++++++++++++++++++------------
 1 files changed, 18 insertions(+), 12 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 980c6e3..d62aa72 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,16 +5,16 @@
 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.GetChargingOrderByLicensePlate;
-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;
@@ -142,27 +142,33 @@
 	 * @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);
-	
+
+
+    TSettlementConfirm settlementAdd(SettlementConfirmAdd dto);
+
+	PageInfo<TSettlementConfirm> settlementList(SettlementListQuery dto);
+
+    SettlementTotalVO settlementTotal(String time);
 }

--
Gitblit v1.7.1