From e473b5ae42cded953f330d54dead49cddfbe457f Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 04 九月 2024 19:13:36 +0800
Subject: [PATCH] 计费模板处理

---
 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java
index b0b15f2..b871f24 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java
@@ -92,7 +92,7 @@
     public AjaxResult<List<TAccountingStrategyDetailVO>> queryAccountingStrategyDetailByStrategyId(@RequestParam("strategyId") Integer strategyId) {
         List<TAccountingStrategyDetailVO> list = accountingStrategyDetailService.queryAccountingStrategyDetailByStrategyId(strategyId);
         list.forEach(detail -> {
-            detail.setTotalPrice(detail.getElectrovalence().add(detail.getElectrovalence()));
+            detail.setTotalPrice(detail.getElectrovalence().add(detail.getServiceCharge()));
         });
         return AjaxResult.ok(list);
     }
@@ -110,6 +110,11 @@
         Boolean flag = accountingStrategyDetailService.isStrategy24Hour(dto.getAccountingStrategyDetails());
         if(flag){
             return AjaxResult.error("计费模板时间设置有误差");
+        }
+        // 判断同阶段是否价格不一致
+        Boolean flag1 = accountingStrategyDetailService.isStrategyPriceConsistent(dto.getAccountingStrategyDetails());
+        if(!flag1){
+            return AjaxResult.error("同阶段费率值需一致");
         }
         Long userId = SecurityUtils.getLoginUser().getUserid();
         dto.setUserId(userId);
@@ -131,6 +136,11 @@
         if(flag){
             return AjaxResult.error("计费模板时间设置有误差");
         }
+        // 判断同阶段是否价格不一致
+        Boolean flag1 = accountingStrategyDetailService.isStrategyPriceConsistent(dto.getAccountingStrategyDetails());
+        if(!flag1){
+            return AjaxResult.error("同阶段费率值需一致");
+        }
         // 判断修改的计费策略是否为已通过
         if(dto.getAuditStatus() == 3 || dto.getAuditStatus() == 4){
             // 查询是否有下级审核中的策略

--
Gitblit v1.7.1