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

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
ialbert 2023-05-27 11:49:22 +03:00
commit 08d17adb1a
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf57Executor.java
View file

@ -239,6 +239,9 @@ public class Sdf57Executor extends AbstractExecutor<SDf57> {
statement.setOperationStatus(OperationStatus.Pending.getKey()); statement.setOperationStatus(OperationStatus.Pending.getKey());
statement.setInSDfId(sdf57.getId()); statement.setInSDfId(sdf57.getId());
statement.setInOutSDfType(InOutSDfType.type57.getKey()); statement.setInOutSDfType(InOutSDfType.type57.getKey());
statement.setClearingDate(LocalDate.now());
statement.setCreated(Instant.now());
return statement; return statement;
} }
@ -332,7 +335,7 @@ public class Sdf57Executor extends AbstractExecutor<SDf57> {
return Optional.ofNullable(registryImdg.getSingleObjectByPredicate(rgstrPredicate)); 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) { private LocalDate payDate(String payDate) {
if (TextUtil.isEmpty(payDate)) { if (TextUtil.isEmpty(payDate)) {

2
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/RegistryBuilder.java
View file

@ -17,6 +17,7 @@ import ru.spcex.platform.enumeration.*;
import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.Imdg;
import ru.spcex.platform.imdg.api.ImdgProvider; import ru.spcex.platform.imdg.api.ImdgProvider;
import java.time.Instant;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
@ -61,6 +62,7 @@ public class RegistryBuilder {
ISide side = getSide(exec); ISide side = getSide(exec);
Registry reg = new Registry(); Registry reg = new Registry();
reg.setCompanyId(exec.getCompanyId()); reg.setCompanyId(exec.getCompanyId());
reg.setCreated(Instant.now());
Company company = searchCompany(); Company company = searchCompany();
reg.setTradingCode(company.getTradingCode()); reg.setTradingCode(company.getTradingCode());
reg.setClearingCode(company.getClearingCode()); reg.setClearingCode(company.getClearingCode());

4
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/RequirementsAndObligationCreation.java
View file

@ -78,14 +78,14 @@ public class RequirementsAndObligationCreation implements ISessionStage {
regSearchMethod.get().apply(exec, regDsgn) regSearchMethod.get().apply(exec, regDsgn)
.ifPresentOrElse(registry -> { .ifPresentOrElse(registry -> {
RegistryUpdater.updater() RegistryUpdater.updater()
.exec(partyExec) .exec(exec)
.registry(registry) .registry(registry)
.update(); .update();
registryImdg.update(registry); registryImdg.update(registry);
}, () -> { }, () -> {
Registry newRegister = RegistryBuilder.builder() Registry newRegister = RegistryBuilder.builder()
.imdg(imdgProvider) .imdg(imdgProvider)
.exec(partyExec) .exec(exec)
.registryDesignation(regDsgn) .registryDesignation(regDsgn)
.build(); .build();
registryImdg.insert(newRegister); registryImdg.insert(newRegister);