费用计算;

This commit is contained in:
王奎兴
2026-04-03 09:26:26 +08:00
parent 4fe5febdb0
commit 11bca1f681
@@ -160,11 +160,13 @@ public class ContractManageApplicationService {
//将计费参数实体分成两组,即:固定参数和条件参数
List<BillingParamsDetailDTO> fixedParamsEntityList = billingParamsEntityList.stream().filter(item -> ObjectUtil.equal(item.getLadderType(),1)).collect(Collectors.toList());
List<BillingParamsDetailDTO> 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());
}
}
}
}