diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/execution/ExecutionFondComponent.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/execution/ExecutionFondComponent.java index f581efac3..f7729db1a 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/execution/ExecutionFondComponent.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/execution/ExecutionFondComponent.java @@ -1,5 +1,6 @@ package ru.spcex.clearing.service.execution; +import static java.lang.String.format; import java.math.BigDecimal; import java.math.RoundingMode; import java.time.Instant; @@ -9,7 +10,6 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; import java.util.Optional; -import static java.lang.String.format; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.slf4j.event.Level; @@ -50,7 +50,6 @@ import ru.spcex.clearing.service.validation.strades.STradesSecurityPresentValida import ru.spcex.clearing.service.validation.strades.TcrByCodeAndCmpIsActiveCashingValidationRule; import ru.spcex.platform.enumeration.CurrencyCode; import ru.spcex.platform.enumeration.InstrumentType; -import ru.spcex.platform.enumeration.NominalTypeCode; import ru.spcex.platform.enumeration.ObjectType; import ru.spcex.platform.enumeration.Priority; import ru.spcex.platform.enumeration.Section; @@ -71,7 +70,6 @@ import ru.spcex.platform.utils.enumeration.IEnumId; import ru.spcex.platform.utils.enumeration.IEnumKey; import ru.spcex.platform.utils.enumeration.IMessageResolver; import ru.spcex.platform.utils.log.ExceptionUtils; -import static ru.spcex.platform.utils.number.BigDecimalUtil.parse; import static ru.spcex.platform.utils.number.BigDecimalUtil.safeBD; import ru.spcex.platform.utils.text.TextUtil; import ru.spcex.platform.utils.time.TimeUtil; @@ -305,15 +303,9 @@ public class ExecutionFondComponent implements IExecutionUploadComponent { if (udr != null) { DigitalCertificateSecurity dcs = (DigitalCertificateSecurity) security; BigDecimal baseUnitSize = BigDecimal.valueOf(Optional.ofNullable(dcs.getBaseUnitSize()).orElse(0L)); - if (NominalTypeCode.INDX.equalsByKey(dcs.getNominalTypeCode())) { - price = safeBD(sTrades.getPrice()) - .multiply(safeBD(dcs.getNominalValue())) - .multiply(baseUnitSize); - } else if (NominalTypeCode.FIXD.equalsByKey(dcs.getNominalTypeCode())) { - price = safeBD(sTrades.getPrice()) - .multiply(safeBD(parse(udr.getRightUnit()))) - .multiply(baseUnitSize); - } + price = safeBD(sTrades.getPrice()) + .multiply(safeBD(dcs.getNominalValue())) + .multiply(baseUnitSize); } eFond.setPrice(price); eFond.setLots(sTrades.getQty()); diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/validation/strades/STradesSecurityDGCTValidationRule.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/validation/strades/STradesSecurityDGCTValidationRule.java index c84d5d555..7315e5204 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/validation/strades/STradesSecurityDGCTValidationRule.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/validation/strades/STradesSecurityDGCTValidationRule.java @@ -18,7 +18,6 @@ import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder; import ru.spcex.platform.imdg.iml.hazelcast.adapter.CashV2; import ru.spcex.platform.imdg.validation.ImdgValidationContext; import ru.spcex.platform.utils.enumeration.EnumMessage; -import ru.spcex.platform.utils.text.TextUtil; import ru.spcex.platform.utils.validation.IValidationRule; public class STradesSecurityDGCTValidationRule implements IValidationRule> { @@ -53,14 +52,14 @@ public class STradesSecurityDGCTValidationRule implements IValidationRule