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

http://jira.mfd.msk:8088/browse/CLS-280 [5]

Browse source
This commit is contained in:
etreschenkov 2023-10-06 11:27:37 +03:00
parent 723f177c25
commit 53810fd4f1
1 changed files with 26 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/ExecutionRegisterService.java
View file

@ -85,8 +85,16 @@ public class ExecutionRegisterService extends QueueConsumer implements Initializ
public void executionRegisterNew(BaseRequest<LauncherCommandRequest> userRequest) { public void executionRegisterNew(BaseRequest<LauncherCommandRequest> userRequest) {
LocalDate localDateNow = LocalDate.now(); LocalDate localDateNow = LocalDate.now();
log.debug("ExecutionRegisterNewRequest received"); log.debug("ExecutionRegisterNewRequest received");
Collection<ExecutionFond> collectionFond = executionFondMap.getCollectionObjectsByFieldValues(Map.of("clearingDate", localDateNow)); Collection<ExecutionFond> collectionFond = executionFondMap.getCollectionObjectsByFieldValues(
Collection<ExecutionDeposit> collectionDeposit = executionDepositMap.getCollectionObjectsByFieldValues(Map.of("clearingDate", localDateNow)); Map.of(
"clearingDate", localDateNow,
"side", Side.SELL.getKey()
));
Collection<ExecutionDeposit> collectionDeposit = executionDepositMap.getCollectionObjectsByFieldValues(
Map.of(
"clearingDate", localDateNow,
"side", MoneyFlowSide.SELL.getKey()
));
log.debug("Found {} ExecutionFond and {} ExecutionDeposit on clearingDate={}", log.debug("Found {} ExecutionFond and {} ExecutionDeposit on clearingDate={}",
collectionFond.size(), collectionDeposit.size(), localDateNow); collectionFond.size(), collectionDeposit.size(), localDateNow);
preClearMap.preClearMap(); preClearMap.preClearMap();
@ -181,12 +189,16 @@ public class ExecutionRegisterService extends QueueConsumer implements Initializ
sellerId = common.getCounterPartyId(); sellerId = common.getCounterPartyId();
buyerId = common.getCompanyId(); buyerId = common.getCompanyId();
if (companySymbolsForCounterPartyId != null) sellerClearingCode = companySymbolsForCounterPartyId.getCompanySymbolValue(); if (companySymbolsForCounterPartyId != null)
sellerClearingCode = companySymbolsForCounterPartyId.getCompanySymbolValue();
sellerTradingClearingRegister = common.getCounterPartyTradingClearingRegistry(); sellerTradingClearingRegister = common.getCounterPartyTradingClearingRegistry();
if (moneyAccountForCounterPartyTkrId != null) sellerMoneyAccount = moneyAccountForCounterPartyTkrId.getAccount(); if (moneyAccountForCounterPartyTkrId != null)
if (depoAccountForCounterPartyTkrId != null) sellerDepoAccount = depoAccountForCounterPartyTkrId.getAccount(); sellerMoneyAccount = moneyAccountForCounterPartyTkrId.getAccount();
if (depoAccountForCounterPartyTkrId != null)
sellerDepoAccount = depoAccountForCounterPartyTkrId.getAccount();
if (companySymbolsForCompanyId != null) buyerClearingCode = companySymbolsForCompanyId.getCompanySymbolValue(); if (companySymbolsForCompanyId != null)
buyerClearingCode = companySymbolsForCompanyId.getCompanySymbolValue();
buyerTradingClearingRegister = common.getPartyTradingClearingRegistry(); buyerTradingClearingRegister = common.getPartyTradingClearingRegistry();
if (moneyAccountForTkrId != null) buyerMoneyAccount = moneyAccountForTkrId.getAccount(); if (moneyAccountForTkrId != null) buyerMoneyAccount = moneyAccountForTkrId.getAccount();
if (depoAccountForTkrId != null) buyerDepoAccount = depoAccountForTkrId.getAccount(); if (depoAccountForTkrId != null) buyerDepoAccount = depoAccountForTkrId.getAccount();
@ -196,15 +208,19 @@ public class ExecutionRegisterService extends QueueConsumer implements Initializ
sellerId = common.getCompanyId(); sellerId = common.getCompanyId();
buyerId = common.getCounterPartyId(); buyerId = common.getCounterPartyId();
if (companySymbolsForCompanyId != null) sellerClearingCode = companySymbolsForCompanyId.getCompanySymbolValue(); if (companySymbolsForCompanyId != null)
sellerClearingCode = companySymbolsForCompanyId.getCompanySymbolValue();
sellerTradingClearingRegister = common.getPartyTradingClearingRegistry(); sellerTradingClearingRegister = common.getPartyTradingClearingRegistry();
if (moneyAccountForTkrId != null) sellerMoneyAccount = moneyAccountForTkrId.getAccount(); if (moneyAccountForTkrId != null) sellerMoneyAccount = moneyAccountForTkrId.getAccount();
if (depoAccountForTkrId != null) sellerDepoAccount = depoAccountForTkrId.getAccount(); if (depoAccountForTkrId != null) sellerDepoAccount = depoAccountForTkrId.getAccount();
if (companySymbolsForCounterPartyId != null) buyerClearingCode = companySymbolsForCounterPartyId.getCompanySymbolValue(); if (companySymbolsForCounterPartyId != null)
buyerClearingCode = companySymbolsForCounterPartyId.getCompanySymbolValue();
buyerTradingClearingRegister = common.getCounterPartyTradingClearingRegistry(); buyerTradingClearingRegister = common.getCounterPartyTradingClearingRegistry();
if (moneyAccountForCounterPartyTkrId != null) buyerMoneyAccount = moneyAccountForCounterPartyTkrId.getAccount(); if (moneyAccountForCounterPartyTkrId != null)
if (depoAccountForCounterPartyTkrId != null) buyerDepoAccount = depoAccountForCounterPartyTkrId.getAccount(); buyerMoneyAccount = moneyAccountForCounterPartyTkrId.getAccount();
if (depoAccountForCounterPartyTkrId != null)
buyerDepoAccount = depoAccountForCounterPartyTkrId.getAccount();
} }