From a16c9bebf9ab97e04afa67db1665549af86948fb Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 07 二月 2025 17:02:30 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ChargingOrderClient.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ChargingOrderClient.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ChargingOrderClient.java
index 4739f81..f684535 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ChargingOrderClient.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ChargingOrderClient.java
@@ -120,8 +120,8 @@
@GetMapping(value = "/financial/settlement/downloadSettlement/{uid}")
public R<TSettlementConfirm> downloadSettlement(@PathVariable("uid") String uid);
- @GetMapping(value = "/financial/settlement/settlementTotalR/{time}")
- public R<SettlementTotalVO> settlementTotalR(@PathVariable("time")String time);
+ @GetMapping(value = "/financial/settlement/settlementTotalR/{time}/{userId}")
+ public R<SettlementTotalVO> settlementTotalR(@PathVariable("time")String time,@PathVariable("userId")Long userId);
/**
* 修改充电订单
@@ -216,7 +216,7 @@
* @param vo
*/
@PostMapping("/t-charging-order/endChargeBillingCharge")
- void endChargeBillingCharge(@RequestBody TransactionRecordMessageVO vo);
+ R endChargeBillingCharge(@RequestBody TransactionRecordMessageVO vo);
/**
* 获取充电订单数据
--
Gitblit v1.7.1