From c564930d687e421e4e35d7fcafadc6d11ff23b9c Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期二, 05 十一月 2024 19:07:44 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/TAccountingStrategyDetailService.java | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/TAccountingStrategyDetailService.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/TAccountingStrategyDetailService.java index 178d0cf..811fa25 100644 --- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/TAccountingStrategyDetailService.java +++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/TAccountingStrategyDetailService.java @@ -23,6 +23,12 @@ * @return */ List<TAccountingStrategyDetailVO> queryAccountingStrategyDetailByStrategyId(Integer strategyId); + /** + * 查询计费策略明细列表---后台 + * @param strategyId + * @return + */ + List<TAccountingStrategyDetailVO> queryMangementAccountingStrategyDetailByStrategyId(Integer strategyId); /** @@ -38,4 +44,24 @@ * @return */ StrategyPriceVO queryPrice(Integer siteId); + /** + * 判断是否满足24小时策略 + * @param accountingStrategyDetails + * @return + */ + Boolean isStrategy24Hour(List<TAccountingStrategyDetail> accountingStrategyDetails); + + /** + * 判断同阶段是否价格不一致 + * @param accountingStrategyDetails + * @return + */ + Boolean isStrategyPriceConsistent(List<TAccountingStrategyDetail> accountingStrategyDetails); + + /** + * 通过枪id查询当前时间段计费策略展示 + * @param gunId + * @return + */ + List<TAccountingStrategyDetailVO> queryStrategyByGunIdAndTime(Integer gunId); } -- Gitblit v1.7.1