treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

http://jira.mfd.msk:8088/browse/CLS-1058

Browse source
This commit is contained in:
ialbert 2026-07-03 16:24:47 +03:00
parent fb57c44f9c
commit 2348a89f01
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/execution/ExecutionCurrencyComponent.java
View file

@ -227,7 +227,7 @@ public class ExecutionCurrencyComponent extends ExecutionAbstractComponent {
IValidator validator = valFor(sTrd);
Optional<EnumMessage> 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()) {

2
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/execution/ExecutionDepositComponent.java
View file

@ -202,7 +202,7 @@ public class ExecutionDepositComponent extends ExecutionAbstractComponent {
IValidator validator = valFor(sTrd);
Optional<EnumMessage> 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()) {

2
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/execution/ExecutionFondComponent.java
View file

@ -234,7 +234,7 @@ public class ExecutionFondComponent extends ExecutionAbstractComponent {
IValidator validator = valFor(sTrd);
Optional<EnumMessage> 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()) {

4
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/validation/strades/TcrByCodeAndCmpIsActiveCashingValidationRuleV2.java
View file

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