From f2dff53d76a7e9a23e6a2ecfed58ce978dc41442 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 06 九月 2024 18:22:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/feignClient/AccountingStrategyDetailClient.java |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/feignClient/AccountingStrategyDetailClient.java b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/feignClient/AccountingStrategyDetailClient.java
index 1a11b6d..94a055e 100644
--- a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/feignClient/AccountingStrategyDetailClient.java
+++ b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/feignClient/AccountingStrategyDetailClient.java
@@ -20,13 +20,7 @@
 public interface AccountingStrategyDetailClient {
 	
 	
-	/**
-	 * 获取当前有效的计费策略明细
-	 * @param accountingStrategyId
-	 * @return
-	 */
-	@PostMapping("/t-accounting-strategy-detail/getNowData")
-	R<TAccountingStrategyDetail> getNowData(@RequestParam("accountingStrategyId") Integer accountingStrategyId);
+	
 	/**
 	 * 通过站点id查询当前时段使用的策略明细
 	 * @param siteId
@@ -48,6 +42,15 @@
 	 */
 	@PostMapping("/t-accounting-strategy-detail/checkChargingStrategy")
 	R<Boolean> checkChargingStrategy(@RequestBody CheckChargingStrategyDTO dto);
+	
+	
+	/**
+	 * 根据计费策略主表id策略明细
+	 * @param id
+	 * @return
+	 */
+	@PostMapping("/t-accounting-strategy-detail/getListByAccountingStrategyId")
+	R<List<TAccountingStrategyDetail>> getListByAccountingStrategyId(@RequestParam("id") Integer id);
 	/**
 	 * 通过桩编号查询当前使用的策略明细列表
 	 * @param code

--
Gitblit v1.7.1