From 8ef73a8875b9b618e471aafc383f85ba6ab7a154 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 11 十二月 2024 19:17:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java
index 7164965..58883a0 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java
@@ -299,10 +299,10 @@
- @GetMapping(value = "/settlementTotalR/{time}")
- public R<SettlementTotalVO> settlementTotalR(@PathVariable("time")String time) {
+ @GetMapping(value = "/settlementTotalR/{time}/{userId}")
+ public R<SettlementTotalVO> settlementTotalR(@PathVariable("time")String time,@PathVariable("userId")Long userId) {
time = time+"-01 00:00:00";
- SettlementTotalVO res = chargingOrderService.settlementTotal(time);
+ SettlementTotalVO res = chargingOrderService.settlementTotalR(time,userId);
return R.ok(res);
}
--
Gitblit v1.7.1