From 88ac2574d89aed7c28b9c0370b19b8bb2d0364eb Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期二, 07 一月 2025 19:02:34 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java index 7a7cbb3..e450b99 100644 --- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java +++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java @@ -780,6 +780,13 @@ } +// @PostMapping("/endChargeBillingCharge1") +// public void endChargeBillingCharge1(@RequestBody TransactionRecordMessageVO vo){ +// log.info("-------------------停止充电返回账单后计算费用及修改业务状态-------------------:" + vo); +// chargingOrderService.endChargeBillingCharge1(vo); +// } + + @RequiresPermissions(value = {"/platformRevenueAnalysis"}, logical = Logical.OR) -- Gitblit v1.7.1