diff --git a/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/AbstractExporterService.java b/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/AbstractExporterService.java index c51f70b7b..c72508111 100644 --- a/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/AbstractExporterService.java +++ b/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/AbstractExporterService.java @@ -41,7 +41,7 @@ public abstract class AbstractExporterService { private final Logger log = LoggerFactory.getLogger(getClass()); protected final Imdg registryImdg; private final List validStatus = List.of(ServiceStatus.Active.getKey(), ServiceStatus.Reopened.getKey()); - private final List validAccountStatus = List.of(AccountStatus.ACTIVE.getKey(), AccountStatus.CLOSE.getKey()); + private final List invalidAccountStatus = List.of(AccountStatus.BLOCKED.getKey(), AccountStatus.CLOSE.getKey()); private final Imdg tradingClearingRegistryImdg; private final Imdg accountImdg; private final SecuritySelector securitySelector; @@ -156,15 +156,15 @@ public abstract class AbstractExporterService { log.warn("For registry.id={} not exist tradingClearingRegistry.id={}", registry.getId(), registry.getTradingClearingRegistryId()); return false; } - if (validStatus.contains(tradingClearingRegistry.getStatus())) { + if (!validStatus.contains(tradingClearingRegistry.getStatus())) { return false; } if (registry.getBalance().equals(BigDecimal.ZERO)) { return false; } - Account account = accountImdg.getSingleObjectByID(tradingClearingRegistry.getMoneyAccountId()); - return !validAccountStatus.contains(account.getAccount()); + Account account = accountImdg.getSingleObjectByID(registry.getAccountId()); + return !invalidAccountStatus.contains(account.getAccount()); } protected BigDecimal sumNegativeABS(Collection registries) {