From 7320cba2abc7beb1f990fb4fd52dc577b8d609dc Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期四, 05 九月 2024 10:44:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 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 dd60b9e..2a28707 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
@@ -111,6 +111,11 @@
if(flag){
return AjaxResult.error("计费模板时间设置有误差");
}
+ // 判断同阶段是否价格不一致
+ Boolean flag1 = accountingStrategyDetailService.isStrategyPriceConsistent(dto.getAccountingStrategyDetails());
+ if(!flag1){
+ return AjaxResult.error("同阶段费率值需一致");
+ }
Long userId = SecurityUtils.getLoginUser().getUserid();
dto.setUserId(userId);
accountingStrategyService.save(dto);
@@ -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