From 11bca1f681f014e457a9d756333c011987956226 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Fri, 3 Apr 2026 09:26:26 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=B9=E7=94=A8=E8=AE=A1=E7=AE=97;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ContractManageApplicationService.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/contractManage/ContractManageApplicationService.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/contractManage/ContractManageApplicationService.java index d9ea39ff7..6aca3f343 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/contractManage/ContractManageApplicationService.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/contractManage/ContractManageApplicationService.java @@ -160,11 +160,13 @@ public class ContractManageApplicationService { //将计费参数实体分成两组，即:固定参数和条件参数 List fixedParamsEntityList = billingParamsEntityList.stream().filter(item -> ObjectUtil.equal(item.getLadderType(),1)).collect(Collectors.toList()); List ladderParamsEntityList = billingParamsEntityList.stream().filter(item -> !ObjectUtil.equal(item.getLadderType(),1)).collect(Collectors.toList()); - if (ladderParamsEntityList != null && ladderParamsEntityList.size() > 0) { + if (fixedParamsEntityList != null && fixedParamsEntityList.size() > 0) { if (subjectAndPriceReturn.getNum() != null) { - for (BillingParamsDetailDTO ladderParamsEntity : ladderParamsEntityList) { - Integer sort1 = ladderParamsEntity.getSort(); - billingFormula.replace("fields"+sort1, subjectAndPriceReturn.getNum().toEngineeringString()); + for (BillingParamsDetailDTO ladderParamsEntity : fixedParamsEntityList) { + String chargingId1 = ladderParamsEntity.getChargingId(); + if (chargingId1 != chargingId) { + billingFormula.replace(chargingId1, subjectAndPriceReturn.getNum().toEngineeringString()); + } } } }