diff --git a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/TradingClearingRegistryService.java b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/TradingClearingRegistryService.java index 646decd21..f8e9a82b9 100644 --- a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/TradingClearingRegistryService.java +++ b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/TradingClearingRegistryService.java @@ -17,6 +17,7 @@ import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; import ru.clearing.classes.statics.data.account.Account; +import ru.clearing.classes.statics.data.account.AccountSymbols; import ru.clearing.classes.statics.data.account.ClearingAccount; import ru.clearing.classes.statics.data.account.ClientCode; import ru.clearing.classes.statics.data.account.DepoAccount; @@ -77,6 +78,7 @@ public class TradingClearingRegistryService extends QueueConsumer implements Ini private final Imdg clearingAccountImdg; private final Imdg informationAccountImdg; private final Imdg accountImdg; + private final Imdg accountSymbolsImdg; private final Imdg companyImdg; private final Imdg companySymbolsImdg; private final Imdg relationImdg; @@ -120,6 +122,7 @@ public class TradingClearingRegistryService extends QueueConsumer implements Ini this.informationAccountImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_InformationAccount, InformationAccount.class); this.companyImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Company, Company.class); this.accountImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Account, Account.class); + this.accountSymbolsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_AccountSymbols, AccountSymbols.class); this.relationImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Relation, Relation.class); this.clientCodeImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_ClientCode, ClientCode.class); this.companySymbolsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_CompanySymbols, CompanySymbols.class); @@ -577,9 +580,11 @@ public class TradingClearingRegistryService extends QueueConsumer implements Ini } tkr.setAccountTypeName(accountType); if (tradingClearingRegistry.getDepoAccountId() != null) { - Account depoAccount = accountImdg.getSingleObjectByID(tradingClearingRegistry.getDepoAccountId()); - if (depoAccount != null) { - tkr.setDepoAccount(depoAccount.getAccount()); + AccountSymbols depoAccountSymbol = accountSymbolsImdg.getFirstObjectByFieldValues( + Map.of("accountId", tradingClearingRegistry.getDepoAccountId()) + ); + if (depoAccountSymbol != null) { + tkr.setDepoAccount(depoAccountSymbol.getAccountSymbolValue()); } } {