From a08075b702c7a4cc7e520a746a13c0b8a5bfe0f7 Mon Sep 17 00:00:00 2001 From: 18650502300 <18650502300@163.com> Date: Thu, 27 Mar 2025 17:47:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=81=E9=A1=B6=E9=87=91=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/web/controller/app/AppController.java | 8 +++++++- .../java/com/ruoyi/system/domain/EtOperatingArea.java | 5 +++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/electripper-admin/src/main/java/com/ruoyi/web/controller/app/AppController.java b/electripper-admin/src/main/java/com/ruoyi/web/controller/app/AppController.java index 9099a29..d1f72cc 100644 --- a/electripper-admin/src/main/java/com/ruoyi/web/controller/app/AppController.java +++ b/electripper-admin/src/main/java/com/ruoyi/web/controller/app/AppController.java @@ -180,13 +180,19 @@ public class AppController extends BaseController * 获取运营区详细信息 */ @GetMapping(value = "/area/{areaId}") - public AjaxResult getInfo(@PathVariable("areaId") Long areaId) + public AjaxResult getInfo(@PathVariable("areaId") Long areaId, Long ruleId) { if(areaId == null){ logger.info("没有传入areaId参数：【areaId={}】",areaId); return error("请传areaId参数"+"【areaId="+areaId+"】"); } EtOperatingArea area = etOperatingAreaService.selectEtOperatingAreaByAreaId(areaId); + if(ruleId != null){ + EtFeeRule etFeeRule = etFeeRuleService.selectEtFeeRuleByRuleId(ruleId); + if(etFeeRule!=null){ + area.setCappedAmount(etFeeRule.getCappedAmount()); + } + } return success(area); } diff --git a/electripper-system/src/main/java/com/ruoyi/system/domain/EtOperatingArea.java b/electripper-system/src/main/java/com/ruoyi/system/domain/EtOperatingArea.java index 66c5ac0..52c8993 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/domain/EtOperatingArea.java +++ b/electripper-system/src/main/java/com/ruoyi/system/domain/EtOperatingArea.java @@ -238,4 +238,9 @@ public class EtOperatingArea extends BaseEntityPlus implements Serializable /** 禁停区数*/ @TableField(exist = false) private Integer bannedRidingAreaNum; + + /** 封顶金额*/ + @TableField(exist = false) + private BigDecimal cappedAmount; + }