From 4c62b64cc158ed07f18ae7060dae71f9d1e3d9fd Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期一, 10 二月 2025 13:57:37 +0800 Subject: [PATCH] 修改bug --- ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java | 28 ++++++++++++++++++++++++---- 1 files changed, 24 insertions(+), 4 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 3bb4884..61f43bf 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; @@ -19,7 +16,9 @@ import com.ruoyi.order.vo.ChargingOrderListInfoVO; import com.ruoyi.order.vo.EndOfChargePageInfo; import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; +import java.math.BigDecimal; import java.time.LocalDate; import java.util.List; import java.util.Map; @@ -178,6 +177,12 @@ */ void endChargeBillingCharge(TransactionRecordMessageVO vo); +// /** +// * 停止充电返回账单后计算费用 +// * @param vo +// */ +// void endChargeBillingCharge1(TransactionRecordMessageVO vo); + /** @@ -280,4 +285,19 @@ List<TChargingOrder> getChargingOrder(TChargingOrderVo order); Long countCar(List<String> brands); + + + /** + * 添加三方平台充电订单数据 + * @param query + */ + R addTripartitePlatformOrder(AddTripartitePlatformOrder query); + + + /** + * 三方平台停止充电操作 + * @param startChargeSeq + * @return + */ + R tripartitePlatformStopCharge(@RequestParam("startChargeSeq") String startChargeSeq); } -- Gitblit v1.7.1