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

Browse source
This commit is contained in:
AKurakin 2024-03-04 15:57:01 +03:00
parent c705b4e27c
commit 8cb0486c0c
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -98,7 +98,12 @@ public class MoneyBalanceRegisterService extends QueueConsumer implements Initia
if (!csvMode) preClearMap.preClearMap(); if (!csvMode) preClearMap.preClearMap();
List<RegistryHistory> registryForReport = new ArrayList<>(); List<RegistryHistory> registryForReport = new ArrayList<>();
for (RegistryHistory registryHistory : registryHistories) { for (RegistryHistory registryHistory : registryHistories) {
if (BigDecimal.ZERO.compareTo(registryHistory.getObject().getDiffBalance()) != 0) continue; AccountType accountType = IEnumKey.getEnumByKey(AccountType.class, registryHistory.getObject().getAccountType());
if (accountType != AccountType.Info &&
BigDecimal.ZERO.compareTo(registryHistory.getObject().getDiffBalance()) != 0) {
log.trace("Ignore id={}, cause diffBalance is not zero.", registryHistory.getObject().getId());
continue;
}
if (!csvMode) insertMoneyBalanceRegister(registryHistory); if (!csvMode) insertMoneyBalanceRegister(registryHistory);
else registryForReport.add(registryHistory); else registryForReport.add(registryHistory);
} }
@ -148,7 +153,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()), // фильтрация по "object.accountType"==Info or diffBalance==0.0 в коде выше по moneyBalanceRegisterNew
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))