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

fix stage 7

Browse source
This commit is contained in:
etreshenkov 2023-06-01 14:06:57 +03:00
parent 283e623f19
commit c5d8260b38
2 changed files with 9 additions and 6 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/builder/PaymentInstructionBuilder.java
View file

@ -89,7 +89,6 @@ public class PaymentInstructionBuilder {
} }
Security security = securityImdg.getSingleObjectByID(registry.getSecurityId()); Security security = securityImdg.getSingleObjectByID(registry.getSecurityId());
if (security != null) { if (security != null) {
paymentInstruction.setCreditLeg_currencyCode(security.getSecuritySymbol());
paymentInstruction.setCreditLeg_securityId(security.getId()); paymentInstruction.setCreditLeg_securityId(security.getId());
} }
@ -124,7 +123,6 @@ public class PaymentInstructionBuilder {
paymentInstruction.setDebitLeg_amount(amount); paymentInstruction.setDebitLeg_amount(amount);
Security security = securityImdg.getSingleObjectByID(registry.getSecurityId()); Security security = securityImdg.getSingleObjectByID(registry.getSecurityId());
if (security != null) { if (security != null) {
paymentInstruction.setDebitLeg_currencyCode(security.getSecuritySymbol());
paymentInstruction.setDebitLeg_securityId(security.getId()); paymentInstruction.setDebitLeg_securityId(security.getId());
} }
} }

13
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FormingPaymentInstruction.java
View file

@ -83,11 +83,16 @@ public class FormingPaymentInstruction implements ISessionStage {
private StageResult formingPaymentInstruction(Long sessionId) { private StageResult formingPaymentInstruction(Long sessionId) {
RegistryTradingParams registryTradingParamsL = new RegistryTradingParams(RegistryDesignation.L, RegistryTradingParams registryTradingParamsC_M_T = new RegistryTradingParams(RegistryDesignation.C,
RegistryInstrumentType.S, null, RegistryUnit.T);
RegistryTradingParams registryTradingParamsC = new RegistryTradingParams(RegistryDesignation.C,
RegistryInstrumentType.M, null, RegistryUnit.T); RegistryInstrumentType.M, null, RegistryUnit.T);
RegistryCodeSqlBuilder registryCodeSqlBuilder = RegistryCodeSqlBuilder.getInstance(registryTradingParamsL, registryTradingParamsC); RegistryTradingParams registryTradingParamsL_S_T = new RegistryTradingParams(RegistryDesignation.L,
RegistryInstrumentType.M, null, RegistryUnit.T);
RegistryTradingParams registryTradingParamsC_S_T = new RegistryTradingParams(RegistryDesignation.C,
RegistryInstrumentType.S, null, RegistryUnit.T);
RegistryTradingParams registryTradingParamsL_M_T = new RegistryTradingParams(RegistryDesignation.L,
RegistryInstrumentType.S, null, RegistryUnit.T);
RegistryCodeSqlBuilder registryCodeSqlBuilder = RegistryCodeSqlBuilder.getInstance(registryTradingParamsL_M_T,
registryTradingParamsC_M_T, registryTradingParamsL_S_T, registryTradingParamsC_S_T);
String registryCodeCondition = registryCodeSqlBuilder.build(); String registryCodeCondition = registryCodeSqlBuilder.build();
Collection<Registry> obligations = registryImdg.getCollectionObjectsBySQL(registryCodeCondition); Collection<Registry> obligations = registryImdg.getCollectionObjectsBySQL(registryCodeCondition);