From 57d1bdeba6f744f0da9c3d1e01e54263ec2d19d8 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 07 九月 2024 10:48:21 +0800
Subject: [PATCH] 代码提交
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 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..e326bf4 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);
@@ -130,6 +135,11 @@
Boolean flag = accountingStrategyDetailService.isStrategy24Hour(dto.getAccountingStrategyDetails());
if(flag){
return AjaxResult.error("计费模板时间设置有误差");
+ }
+ // 判断同阶段是否价格不一致
+ Boolean flag1 = accountingStrategyDetailService.isStrategyPriceConsistent(dto.getAccountingStrategyDetails());
+ if(!flag1){
+ return AjaxResult.error("同阶段费率值需一致");
}
// 判断修改的计费策略是否为已通过
if(dto.getAuditStatus() == 3 || dto.getAuditStatus() == 4){
@@ -316,6 +326,12 @@
byId.setAuditStatus(3);
byId.setTwoRemark(steategyPassDto.getRemark());
byId.setTwoAuditTime(LocalDateTime.now());
+
+ //如果parentId不为空，则将parentId对应的siteId改为现在的，并且将parenId对应的数据删除
+
+
+ //将site表对应的模板id修改为新的这个
+
}
}else {
byId.setAuditStatus(4);
@@ -405,5 +421,18 @@
return R.ok(res);
}
+
+
+ /**
+ * 根据id查询数据
+ * @param id
+ * @return
+ */
+ @PostMapping(value = "/getAccountingStrategyById")
+ public R<TAccountingStrategy> getAccountingStrategyById(@RequestParam("id") Integer id) {
+ TAccountingStrategy accountingStrategy = accountingStrategyService.getById(id);
+ return R.ok(accountingStrategy);
+ }
+
}
--
Gitblit v1.7.1