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()); + } } } }