diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/builder/PaymentInstructionBuilder.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/builder/PaymentInstructionBuilder.java index 5487fdf99..90d400e03 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/builder/PaymentInstructionBuilder.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/builder/PaymentInstructionBuilder.java @@ -89,7 +89,6 @@ public class PaymentInstructionBuilder { } Security security = securityImdg.getSingleObjectByID(registry.getSecurityId()); if (security != null) { - paymentInstruction.setCreditLeg_currencyCode(security.getSecuritySymbol()); paymentInstruction.setCreditLeg_securityId(security.getId()); } @@ -124,7 +123,6 @@ public class PaymentInstructionBuilder { paymentInstruction.setDebitLeg_amount(amount); Security security = securityImdg.getSingleObjectByID(registry.getSecurityId()); if (security != null) { - paymentInstruction.setDebitLeg_currencyCode(security.getSecuritySymbol()); paymentInstruction.setDebitLeg_securityId(security.getId()); } } diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FormingPaymentInstruction.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FormingPaymentInstruction.java index b94b6bd5a..afe3be8ef 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FormingPaymentInstruction.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FormingPaymentInstruction.java @@ -83,11 +83,16 @@ public class FormingPaymentInstruction implements ISessionStage { private StageResult formingPaymentInstruction(Long sessionId) { - RegistryTradingParams registryTradingParamsL = new RegistryTradingParams(RegistryDesignation.L, - RegistryInstrumentType.S, null, RegistryUnit.T); - RegistryTradingParams registryTradingParamsC = new RegistryTradingParams(RegistryDesignation.C, + RegistryTradingParams registryTradingParamsC_M_T = new RegistryTradingParams(RegistryDesignation.C, 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(); Collection obligations = registryImdg.getCollectionObjectsBySQL(registryCodeCondition);