From 2348a89f011d6140a8490cedf17f6efa16068176 Mon Sep 17 00:00:00 2001 From: ialbert Date: Fri, 3 Jul 2026 16:24:47 +0300 Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-1058 --- .../service/execution/ExecutionCurrencyComponent.java | 2 +- .../clearing/service/execution/ExecutionDepositComponent.java | 2 +- .../clearing/service/execution/ExecutionFondComponent.java | 2 +- .../TcrByCodeAndCmpIsActiveCashingValidationRuleV2.java | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/execution/ExecutionCurrencyComponent.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/execution/ExecutionCurrencyComponent.java index 78583b9b7..a01a31127 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/execution/ExecutionCurrencyComponent.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/execution/ExecutionCurrencyComponent.java @@ -227,7 +227,7 @@ public class ExecutionCurrencyComponent extends ExecutionAbstractComponent { IValidator validator = valFor(sTrd); Optional error = validator.tillFirstError(); STrades counter = validator.getStored(ValidationStored.STradesCounterTrade); - if (counter != null && fromId != null && counter.getId() < fromId) { + if (counter != null && !cleanLoad && counter.getId() < fromId) { sTrades.add(counter); } if (error.isPresent()) { diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/execution/ExecutionDepositComponent.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/execution/ExecutionDepositComponent.java index 77e39a4e7..f7859fc8c 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/execution/ExecutionDepositComponent.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/execution/ExecutionDepositComponent.java @@ -202,7 +202,7 @@ public class ExecutionDepositComponent extends ExecutionAbstractComponent { IValidator validator = valFor(sTrd); Optional error = validator.tillFirstError(); STrades counter = validator.getStored(ValidationStored.STradesCounterTrade); - if (counter != null && fromId != null && counter.getId() < fromId) { + if (counter != null && !cleanLoad && counter.getId() < fromId) { sTrades.add(counter); } if (error.isPresent()) { 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 deed1f86a..fa6eb488a 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 @@ -234,7 +234,7 @@ public class ExecutionFondComponent extends ExecutionAbstractComponent { IValidator validator = valFor(sTrd); Optional error = validator.tillFirstError(); STrades counter = validator.getStored(ValidationStored.STradesCounterTrade); - if (counter != null && fromId != null && counter.getId() < fromId) { + if (counter != null && !cleanLoad && counter.getId() < fromId) { sTrades.add(counter); } if (error.isPresent()) { diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/validation/strades/TcrByCodeAndCmpIsActiveCashingValidationRuleV2.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/validation/strades/TcrByCodeAndCmpIsActiveCashingValidationRuleV2.java index 4ce96ac5f..3052ea594 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/validation/strades/TcrByCodeAndCmpIsActiveCashingValidationRuleV2.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/validation/strades/TcrByCodeAndCmpIsActiveCashingValidationRuleV2.java @@ -50,7 +50,7 @@ public class TcrByCodeAndCmpIsActiveCashingValidationRuleV2 implements IValidati ImdgPredicateBuilder pb = tcrImdg.predicateBuilder(); String code = validatedObject.getAccount().trim(); - Long cmpId = ((Company) context.getStoredObject(ValidationStored.STradesCompany)).getId(); + Long cmpId = ((Company) context.getStoredObject(cmpEnum)).getId(); ImdgPredicate prdct = pb.and( pb.equals("code", code), pb.equals("companyId", cmpId) @@ -70,7 +70,7 @@ public class TcrByCodeAndCmpIsActiveCashingValidationRuleV2 implements IValidati if (IEnumKey.contains(status, ServiceStatus.Blocked, ServiceStatus.Suspended, ServiceStatus.Closed)) { return of(ClearingError.TradingClearingRegistryNotActive, validatedObject.getAccount()); } - context.storeObject(ValidationStored.STradesTradingClearingRegistry, tcr); + context.storeObject(tcrEnum, tcr); return empty(); }