diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf57Executor.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf57Executor.java index a46759c15..fe522a651 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf57Executor.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf57Executor.java @@ -193,17 +193,19 @@ public class Sdf57Executor extends AbstractExecutor { registryImdg.insert(registryB); }; - Consumer createRegD = (dsgn) -> { - findRegByDesignation(stmt, RegistryDesignation.O).ifPresent(registry -> { - Registry registryD = copyRegD(registry); - registryImdg.insert(registryD); - }); - }; - findRegByDesignation(stmt, RegistryDesignation.A).ifPresentOrElse(update, () -> createRegA.accept(RegistryDesignation.A)); - if (!StringUtils.isEmpty(sdf57.getSpecif()) && pattern.matcher(sdf57.getSpecif()).find()) { + InOutDirection direction = IEnumKey.getEnumByKey(InOutDirection.class, stmt.getInOutDirection()); + if (!StringUtils.isEmpty(sdf57.getSpecif()) && pattern.matcher(sdf57.getSpecif()).find() && InOutDirection.in.equals(direction)) { //todo доделать 11. Идентификация средств УК на клиринговом счете - findRegByDesignation(stmt, RegistryDesignation.D).ifPresentOrElse(update, () -> createRegD.accept(RegistryDesignation.D)); + findRegByDesignation(stmt, RegistryDesignation.D).ifPresentOrElse(rgs -> { + rgs.setBalance(safeBD(rgs.getBalance()).add(safeBD(stmt.getAmount()))); + rgs.setUpdated(Instant.now()); + registryImdg.update(rgs); + }, + () -> findRegByDesignation(stmt, RegistryDesignation.O).ifPresent(rgs -> { + Registry registryD = copyRegD(rgs); + registryImdg.insert(registryD); + })); } stmt.setOperationStatus(OperationStatus.Executed.getKey()); } else { @@ -377,7 +379,7 @@ public class Sdf57Executor extends AbstractExecutor { pb.equals("companyId", s.getAddresseeId()), pb.equals("accountId", s.getAccountId()) ); - if (des.equals(RegistryDesignation.D) && !TextUtil.isEmpty(s.getContract())) { + if (des.equals(RegistryDesignation.D) || des.equals(RegistryDesignation.O) && !TextUtil.isEmpty(s.getContract())) { rgstrPredicate = pb.and(rgstrPredicate, pb.equals("contract", s.getContract())); } return Optional.ofNullable(registryImdg.getSingleObjectByPredicate(rgstrPredicate));