From dd419a48b8f1b8ce5bd3906ea81ad32575929cb0 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 07 一月 2025 18:05:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 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 4089d09..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
@@ -230,7 +230,7 @@
data.setRecords(res1);
return R.ok(data);
}
-public static List<PayOrderDto> testing5(long total, long current, long size, List<PayOrderDto> str){
+ public static List<PayOrderDto> testing5(long total, long current, long size, List<PayOrderDto> str){
List<PayOrderDto> result = new ArrayList<>();
//获取初始化分页结构
com.ruoyi.order.util.Page<PayOrderDto> page = new com.ruoyi.order.util.Page().getPage(total, size, current - 1);
@@ -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