From 71d710e252dccfaf35804c5d0e6a3f00dac9be2b Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 11 九月 2024 09:30:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TAccountingStrategyDetailServiceImpl.java | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TAccountingStrategyDetailServiceImpl.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TAccountingStrategyDetailServiceImpl.java
index 785ad38..2412c8c 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TAccountingStrategyDetailServiceImpl.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TAccountingStrategyDetailServiceImpl.java
@@ -24,10 +24,7 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.time.LocalTime;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -64,7 +61,7 @@
throw new ServiceException("未查询到计费策略");
}
List<TAccountingStrategyDetailVO> list = this.queryAccountingStrategyDetailByStrategyId(accountingStrategy.getId());
- list.stream().filter(item -> "24:00".equals(item.getEndTime())).forEach(item -> item.setEndTime("23:59:59"));
+ list.stream().filter(item -> "00:00".equals(item.getEndTime())).forEach(item -> item.setEndTime("23:59:59"));
// 获取当前登录用户id
Long userId = tokenService.getLoginUserApplet().getUserId();
// 根据id查询用户信息
@@ -146,4 +143,23 @@
return isFirstElementValid || !isTimeContinuous;
}
+
+ @Override
+ public Boolean isStrategyPriceConsistent(List<TAccountingStrategyDetail> accountingStrategyDetails) {
+ Map<Integer, BigDecimal> phaseToServiceFee = new HashMap<>();
+ for (TAccountingStrategyDetail detail : accountingStrategyDetails) {
+ Integer type = detail.getType();
+ BigDecimal serviceFee = detail.getServiceCharge();
+
+ if (phaseToServiceFee.containsKey(type)) {
+ BigDecimal existingFee = phaseToServiceFee.get(type);
+ if (!existingFee.equals(serviceFee)) {
+ return false; // 发现不一致的服务费
+ }
+ } else {
+ phaseToServiceFee.put(type, serviceFee);
+ }
+ }
+ return true; // 所有相同阶段的服务费一致
+ }
}
--
Gitblit v1.7.1