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

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

Browse source
This commit is contained in:
etreschenkov 2026-05-06 15:57:37 +03:00
parent e885acf843
commit 6567c3b02e
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/component/validation/OrderCurrencyByCompanyAndTcrAlreadyPresent.java
View file

@ -7,6 +7,7 @@ import ru.spcex.clearing.dflt.management.error.DefaultManagementErrors;
import ru.spcex.clearing.imdg.IMDGDistributedNames;
import ru.spcex.platform.classes.base.interfaces.WithCompanyId;
import ru.spcex.platform.classes.base.interfaces.WithTcrId;
import ru.spcex.platform.enumeration.OrderStatus;
import ru.spcex.platform.imdg.api.Imdg;
import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder;
import ru.spcex.platform.imdg.validation.ImdgValidationContext;
@ -29,7 +30,8 @@ public class OrderCurrencyByCompanyAndTcrAlreadyPresent<T extends WithTcrId & Wi
Collection<OrderCurrency> orders = imdg.getCollectionObjectsByPredicate(
pb.and(
pb.equals("tradingClearingRegistryId", validatedObject.getTradingClearingRegistryId()),
pb.equals("companyId", validatedObject.getCompanyId())
pb.equals("companyId", validatedObject.getCompanyId()),
pb.equals("status", OrderStatus.CREATED.getKey())
)
);
if (!orders.isEmpty()) {

6
clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/config/ValidationConfig.java
View file

@ -463,7 +463,8 @@ public class ValidationConfig {
pb.equals("type", OrderAffil.PLBL.getKey()),
pb.equals("registryId", oc.getRegistryId()),
pb.equals("companyId", oc.getCounterPartyId()),
pb.equals("counterPartyId", oc.getCompanyId())
pb.equals("counterPartyId", oc.getCompanyId()),
pb.equals("status", OrderStatus.CREATED.getKey())
);
})
.mapName(IMDGDistributedNames.Map_OrderCurrency)
@ -509,7 +510,8 @@ public class ValidationConfig {
pb.equals("type", OrderAffil.PLBL.getKey()),
pb.equals("registryId", oc.getRegistryId()),
pb.equals("companyId", oc.getCounterPartyId()),
pb.equals("counterPartyId", oc.getCompanyId())
pb.equals("counterPartyId", oc.getCompanyId()),
pb.equals("status", OrderStatus.CREATED.getKey())
);
})
.mapName(IMDGDistributedNames.Map_OrderCurrency)

2
clearing-parent/imdg/src/main/resources/application.properties
View file

@ -7,7 +7,7 @@ imdg.hazelcast.instance-name=instance
imdg.hazelcast.db-sync-seconds=10
imdg.database.login=clearing
imdg.database.password=Aa111111
imdg.database.url=jdbc:postgresql://10.200.200.133:5432/clearing?currentSchema=clearing_prod
imdg.database.url=jdbc:postgresql://10.200.200.133:5432/clearing_stress_curr
#imdg.database.url=jdbc:postgresql://10.200.200.133:5432/postgres?currentSchema=clearing_tester
imdg.database.min-pool-size=10
imdg.database.max-pool-size=30