From 7728f1474626e882855326aea0124d4c667f9f74 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 11 九月 2024 17:20:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/feignClient/AccountingStrategyDetailClient.java | 26 +++++++++++++++++++-------
1 files changed, 19 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 613cd1b..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
@@ -10,6 +10,8 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
+import java.util.List;
+
/**
* @author zhibing.pu
* @Date 2024/8/28 18:33
@@ -18,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
@@ -46,4 +42,20 @@
*/
@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
+ * @return
+ */
+ @PostMapping("/t-accounting-strategy-detail/getDetailListByCode")
+ R<List<TAccountingStrategyDetail>> getDetailListByCode(@RequestParam("code") String code);
}
--
Gitblit v1.7.1