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

registry-service http://jira.mfd.msk:8088/browse/CLS-653 improvement MoneyBalanceRegisterService

Browse source
This commit is contained in:
AKurakin 2024-03-04 13:03:51 +03:00
parent 42c75db19e
commit c705b4e27c
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/builders/ExecutionRegisterReportBuilder.java
View file

@ -93,7 +93,7 @@ public class ExecutionRegisterReportBuilder extends XLSXReportBuilder<ExecutionR
entity.setBuyerCode(companySymbolsByCompanyId.getCompanySymbolValue()); entity.setBuyerCode(companySymbolsByCompanyId.getCompanySymbolValue());
} }
entity.setBuyerTkr(input.getPartyTradingClearingRegistry()); entity.setBuyerTkr(input.getPartyTradingClearingRegistry());
} } else
if (Arrays.asList(Side.SELL.getKey(), MoneyFlowSide.SELL.getKey()).contains(input.getSide().toUpperCase())) { if (Arrays.asList(Side.SELL.getKey(), MoneyFlowSide.SELL.getKey()).contains(input.getSide().toUpperCase())) {
if (companyByCompanyId != null) { if (companyByCompanyId != null) {
entity.setSeller(companyByCompanyId.getShortName()); entity.setSeller(companyByCompanyId.getShortName());
@ -108,7 +108,13 @@ public class ExecutionRegisterReportBuilder extends XLSXReportBuilder<ExecutionR
entity.setBuyerCode(companySymbolsByCounterPartyId.getCompanySymbolValue()); entity.setBuyerCode(companySymbolsByCounterPartyId.getCompanySymbolValue());
} }
entity.setBuyerTkr(input.getCounterPartyTradingClearingRegistry()); entity.setBuyerTkr(input.getCounterPartyTradingClearingRegistry());
} else {
log.warn("{}[{}] has wrong or empty field: side={}. Can not fill buyer/seller.",
input.getClass().getSimpleName(), input.getId(), input.getSide());
} }
} else {
log.warn("{}[{}] has wrong or empty field: side={} CompanyId={} CounterPartyId={}. Can not fill buyer/seller.",
input.getClass().getSimpleName(), input.getId(), input.getSide(), input.getCompanyId(), input.getCounterPartyId());
} }
if (input.getExchangeExecutionTime() != null) if (input.getExchangeExecutionTime() != null)

1
clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/MoneyBalanceRegisterService.java
View file

@ -148,6 +148,7 @@ public class MoneyBalanceRegisterService extends QueueConsumer implements Initia
ImdgPredicate finalPredicate = pb.and( ImdgPredicate finalPredicate = pb.and(
registryPredicate, registryPredicate,
pb.notNull("object.tradingClearingRegistry"), pb.notNull("object.tradingClearingRegistry"),
pb.equals("object.accountType", AccountType.Info.getKey()),
pb.and( pb.and(
pb.greatEqual("eventTime", now), pb.greatEqual("eventTime", now),
pb.less("eventTime", now.plus(1, ChronoUnit.DAYS)) pb.less("eventTime", now.plus(1, ChronoUnit.DAYS))