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 58489e65b..3efdc6c1e 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 @@ -239,6 +239,9 @@ public class Sdf57Executor extends AbstractExecutor { statement.setOperationStatus(OperationStatus.Pending.getKey()); statement.setInSDfId(sdf57.getId()); statement.setInOutSDfType(InOutSDfType.type57.getKey()); + + statement.setClearingDate(LocalDate.now()); + statement.setCreated(Instant.now()); return statement; } @@ -332,7 +335,7 @@ public class Sdf57Executor extends AbstractExecutor { return Optional.ofNullable(registryImdg.getSingleObjectByPredicate(rgstrPredicate)); } - DateTimeFormatter payDateFormatter = DateTimeFormatter.ofPattern("yy.MM.dd"); + DateTimeFormatter payDateFormatter = DateTimeFormatter.ofPattern("dd.MM.yy"); private LocalDate payDate(String payDate) { if (TextUtil.isEmpty(payDate)) { diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/RegistryBuilder.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/RegistryBuilder.java index 4a3fac944..18f16b394 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/RegistryBuilder.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/RegistryBuilder.java @@ -17,6 +17,7 @@ import ru.spcex.platform.enumeration.*; import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.ImdgProvider; +import java.time.Instant; import java.time.LocalDate; import java.time.format.DateTimeFormatter; @@ -61,6 +62,7 @@ public class RegistryBuilder { ISide side = getSide(exec); Registry reg = new Registry(); reg.setCompanyId(exec.getCompanyId()); + reg.setCreated(Instant.now()); Company company = searchCompany(); reg.setTradingCode(company.getTradingCode()); reg.setClearingCode(company.getClearingCode()); diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/RequirementsAndObligationCreation.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/RequirementsAndObligationCreation.java index f1c09034d..cefc2a58a 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/RequirementsAndObligationCreation.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/RequirementsAndObligationCreation.java @@ -78,14 +78,14 @@ public class RequirementsAndObligationCreation implements ISessionStage { regSearchMethod.get().apply(exec, regDsgn) .ifPresentOrElse(registry -> { RegistryUpdater.updater() - .exec(partyExec) + .exec(exec) .registry(registry) .update(); registryImdg.update(registry); }, () -> { Registry newRegister = RegistryBuilder.builder() .imdg(imdgProvider) - .exec(partyExec) + .exec(exec) .registryDesignation(regDsgn) .build(); registryImdg.insert(newRegister);