From f04b094ac41588de6b920dd5cd9b286e01055c9d Mon Sep 17 00:00:00 2001 From: ialbert Date: Sat, 27 May 2023 11:49:12 +0300 Subject: [PATCH] SDF01 statement#clearingDate,securityId fix --- .../service/executors/Sdf01Executor.java | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf01Executor.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf01Executor.java index cbb9e0fb7..47f3f1f9c 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf01Executor.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf01Executor.java @@ -45,9 +45,7 @@ import java.time.format.DateTimeFormatter; import java.util.Collection; import java.util.Map; import java.util.Optional; -import java.util.function.Consumer; import java.util.function.Function; -import java.util.function.Supplier; @Service public class Sdf01Executor extends AbstractExecutor { @@ -136,15 +134,6 @@ public class Sdf01Executor extends AbstractExecutor { Optional err = validateActiveness(company, account); if (err.isEmpty()) { - Consumer update = rgs -> { - updateReg(stmt, rgs); - registryImdg.update(rgs); - }; - Supplier create = () -> { - Registry registry = createRegistryByStatement(stmt, company, account); - registryImdg.insert(registry); - return registry; - }; Optional reg = findReg(stmt); Registry rgs; if (reg.isPresent()) { @@ -185,6 +174,11 @@ public class Sdf01Executor extends AbstractExecutor { stmt.setOperationStatus(OperationStatus.Pending.getKey()); stmt.setInSDfId(sdf01.getId()); stmt.setInOutSDfType(InOutSDfType.type1.getKey()); + stmt.setClearingDate(LocalDate.now()); + Currency currency = currencyImdg.getSingleObjectByFieldValues(Map.of("currencyCode", CurrencyCode.RUB.getKey())); + if (currency != null) { + stmt.setSecurityId(currency.getId()); + } stmt.setCreated(Instant.now()); return stmt; }