diff --git a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/validation/TradingClearingRegistryValidationConfig.java b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/validation/TradingClearingRegistryValidationConfig.java index 86da17f54..b37800940 100644 --- a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/validation/TradingClearingRegistryValidationConfig.java +++ b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/validation/TradingClearingRegistryValidationConfig.java @@ -166,7 +166,8 @@ public class TradingClearingRegistryValidationConfig { if (Objects.equals(duplicate.getMoneyAccountId(), validatedObject.getMoneyAccountId())) { dubAcc = accountImdg.getSingleObjectByID(validatedObject.getMoneyAccountId()); } - if (Objects.equals(duplicate.getDepoAccountId(), validatedObject.getDepoAccountId())) { + if (validatedObject.getDepoAccountId() != null && + validatedObject.getDepoAccountId().equals(duplicate.getDepoAccountId())) { dubAcc = accountImdg.getSingleObjectByID(validatedObject.getDepoAccountId()); } if (dubAcc != null) { diff --git a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/v2/facade/ClientCodeFacade.java b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/v2/facade/ClientCodeFacade.java index b15572b17..a2322728d 100644 --- a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/v2/facade/ClientCodeFacade.java +++ b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/v2/facade/ClientCodeFacade.java @@ -12,6 +12,7 @@ import ru.spcex.clearing.platform.messaging.domain.cud.account.ClientCodeNewRequ import ru.spcex.clearing.platform.messaging.domain.cud.registry.TradingClearingRegistryListNewRequest; import ru.spcex.clearing.platform.messaging.domain.cud.registry.TradingClearingRegistryNewRequest; import ru.spcex.platform.classes.base.interfaces.IClearingFacade; +import ru.spcex.platform.enumeration.Status; import ru.spcex.platform.enumeration.TradingClearingRegistryType; import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.ImdgId; @@ -78,7 +79,7 @@ public class ClientCodeFacade implements IClearingFacade { clientCode.setCompanyId(request.getCompanyId()); clientCode.setCode(request.getCode()); clientCode.setTradingClearingRegistryId(tradingClearingRegistry.getId()); - clientCode.setStatus(request.getStatus()); + clientCode.setStatus(Status.Active.getKey()); clientCodeImdg.insert(clientCode); log.debug("successfully processed, new clientCode id {}", clientCode.getId()); } diff --git a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/v2/listeners/ClientCodeMessageListener.java b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/v2/listeners/ClientCodeMessageListener.java index eabf0f4af..b6b4019ce 100644 --- a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/v2/listeners/ClientCodeMessageListener.java +++ b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/v2/listeners/ClientCodeMessageListener.java @@ -194,11 +194,12 @@ public class ClientCodeMessageListener extends QueueConsumer implements Initiali } Optional rubMoneyAcc = accountIds.stream() - .filter(longStringPair -> CurrencyCode.RUB.equalsByKey(longStringPair.getSecond())) + .filter(pair -> CurrencyCode.RUB.equalsByKey(pair.getSecond())) .findFirst() .map(Pair::getFirst); List accIds = accountIds.stream() + .filter(pair -> !CurrencyCode.RUB.equalsByKey(pair.getSecond())) .map(Pair::getFirst) .toList(); ClientCodeNewRequest clientCodeNewRequest = new ClientCodeNewRequest(); diff --git a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/validation/GatewayEksClientCodeValidationRule.java b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/validation/GatewayEksClientCodeValidationRule.java index 181a01760..d0e0db98e 100644 --- a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/validation/GatewayEksClientCodeValidationRule.java +++ b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/validation/GatewayEksClientCodeValidationRule.java @@ -104,7 +104,7 @@ public enum GatewayEksClientCodeValidationRule implements IValidationRule