From 0275498af38bc1c8fbc5bfea54f3cce3550fd6ab Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期二, 11 二月 2025 09:57:54 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile into 1.1 --- ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java | 17 ++++------------- 1 files changed, 4 insertions(+), 13 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 175381f..d82ae1a 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 @@ -7,10 +7,7 @@ import com.ruoyi.common.core.web.domain.AjaxResult; 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.model.*; import com.ruoyi.order.api.query.ChargingOrderQuery; import com.ruoyi.order.api.query.SettlementListQuery; import com.ruoyi.order.api.query.UploadRealTimeMonitoringDataQuery; @@ -178,13 +175,7 @@ * 停止充电返回账单后计算费用 * @param vo */ - void endChargeBillingCharge(TransactionRecordMessageVO vo); - -// /** -// * 停止充电返回账单后计算费用 -// * @param vo -// */ -// void endChargeBillingCharge1(TransactionRecordMessageVO vo); + R endChargeBillingCharge(TransactionRecordMessageVO vo); @@ -292,9 +283,9 @@ /** * 添加三方平台充电订单数据 - * @param chargingGunId + * @param query */ - R addTripartitePlatformOrder(Integer chargingGunId, String operatorId, Integer rechargePaymentType, BigDecimal paymentAmount, String startChargeSeq); + R addTripartitePlatformOrder(AddTripartitePlatformOrder query); /** -- Gitblit v1.7.1