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

http://jira.mfd.msk:8088/browse/CLS-1023

Browse source
This commit is contained in:
etreschenkov 2026-05-26 08:31:50 +03:00
parent c1db1714ef
commit 3f95a5b3c2
4 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/validation/TradingClearingRegistryValidationConfig.java
View file

@ -166,7 +166,8 @@ public class TradingClearingRegistryValidationConfig {
if (Objects.equals(duplicate.getMoneyAccountId(), validatedObject.getMoneyAccountId())) { if (Objects.equals(duplicate.getMoneyAccountId(), validatedObject.getMoneyAccountId())) {
dubAcc = accountImdg.getSingleObjectByID(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()); dubAcc = accountImdg.getSingleObjectByID(validatedObject.getDepoAccountId());
} }
if (dubAcc != null) { if (dubAcc != null) {

3
clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/v2/facade/ClientCodeFacade.java
View file

@ -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.TradingClearingRegistryListNewRequest;
import ru.spcex.clearing.platform.messaging.domain.cud.registry.TradingClearingRegistryNewRequest; import ru.spcex.clearing.platform.messaging.domain.cud.registry.TradingClearingRegistryNewRequest;
import ru.spcex.platform.classes.base.interfaces.IClearingFacade; import ru.spcex.platform.classes.base.interfaces.IClearingFacade;
import ru.spcex.platform.enumeration.Status;
import ru.spcex.platform.enumeration.TradingClearingRegistryType; import ru.spcex.platform.enumeration.TradingClearingRegistryType;
import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.Imdg;
import ru.spcex.platform.imdg.api.ImdgId; import ru.spcex.platform.imdg.api.ImdgId;
@ -78,7 +79,7 @@ public class ClientCodeFacade implements IClearingFacade {
clientCode.setCompanyId(request.getCompanyId()); clientCode.setCompanyId(request.getCompanyId());
clientCode.setCode(request.getCode()); clientCode.setCode(request.getCode());
clientCode.setTradingClearingRegistryId(tradingClearingRegistry.getId()); clientCode.setTradingClearingRegistryId(tradingClearingRegistry.getId());
clientCode.setStatus(request.getStatus()); clientCode.setStatus(Status.Active.getKey());
clientCodeImdg.insert(clientCode); clientCodeImdg.insert(clientCode);
log.debug("successfully processed, new clientCode id {}", clientCode.getId()); log.debug("successfully processed, new clientCode id {}", clientCode.getId());
} }

3
clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/v2/listeners/ClientCodeMessageListener.java
View file

@ -194,11 +194,12 @@ public class ClientCodeMessageListener extends QueueConsumer implements Initiali
} }
Optional<Long> rubMoneyAcc = accountIds.stream() Optional<Long> rubMoneyAcc = accountIds.stream()
.filter(longStringPair -> CurrencyCode.RUB.equalsByKey(longStringPair.getSecond())) .filter(pair -> CurrencyCode.RUB.equalsByKey(pair.getSecond()))
.findFirst() .findFirst()
.map(Pair::getFirst); .map(Pair::getFirst);
List<Long> accIds = accountIds.stream() List<Long> accIds = accountIds.stream()
.filter(pair -> !CurrencyCode.RUB.equalsByKey(pair.getSecond()))
.map(Pair::getFirst) .map(Pair::getFirst)
.toList(); .toList();
ClientCodeNewRequest clientCodeNewRequest = new ClientCodeNewRequest(); ClientCodeNewRequest clientCodeNewRequest = new ClientCodeNewRequest();

2
clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/validation/GatewayEksClientCodeValidationRule.java
View file

@ -104,7 +104,7 @@ public enum GatewayEksClientCodeValidationRule implements IValidationRule<ImdgVa
TradingClearingRegistry.class); TradingClearingRegistry.class);
TradingClearingRegistry tcr = imdg.getFirstObjectByFieldValues( TradingClearingRegistry tcr = imdg.getFirstObjectByFieldValues(
Map.of( Map.of(
"depoAccountId", depoAccount.getId(), "depoAccountId", depoAccount.getAccountId(),
"status", Status.Active.getKey() "status", Status.Active.getKey()
) )
); );