From c4664502dfdaffff555b532e65b51a57ac8b29c2 Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期三, 16 十月 2024 17:51:32 +0800 Subject: [PATCH] 合并代码 --- ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java | 34 ++++++++++++++++++++++++++++------ 1 files changed, 28 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 790dc57..0593bb3 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; @@ -83,14 +81,14 @@ * 安全检测数据 * @param securityDetection */ - void securityDetection(SecurityDetection securityDetection); + void securityDetection(SecurityDetectionVO securityDetection); /** * 启动充电应发 * @param message */ - void startChargeSuccessfully(PlatformStartChargingReplyMessage message); + void startChargeSuccessfully(PlatformStartChargingReplyMessageVO message); /** @@ -119,6 +117,15 @@ * @return */ AjaxResult stopCharging(String id); + + + /** + * 停止充电应答结果处理 + * @param platformStopChargingReply + */ + void terminateSuccessfulResponse(PlatformStopChargingReplyVO platformStopChargingReply); + + TCharingOrderVO chargingOrder(ChargingOrderQuery dto); @@ -163,7 +170,14 @@ * @param code */ void endCharge(String code, Integer endMode); - + + /** + * 停止充电返回账单后计算费用 + * @param vo + */ + void endChargeBillingCharge(TransactionRecordMessageVO vo); + + /** * 异常结束充电处理逻辑 @@ -243,4 +257,12 @@ List<Map<String, Object>> countAllUserData(); List<Map<String, Object>> needElec1(List<Integer> siteIds, ChargingStatisticsQueryDto statisticsQueryDto); + + + /** + * 获取充电结束页面详情 + * @param id + * @return + */ + EndOfChargePageInfo getEndOfChargePageInfo(String id); } -- Gitblit v1.7.1