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

финальная сессия МКР шаг 7

Browse source
This commit is contained in:
ialbert 2023-06-30 18:44:32 +03:00
parent d91383b4e5
commit 61332c5b73
2 changed files with 22 additions and 19 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/session/stage/impl/FormingPaymentInstructionDealsFinalMkr.java
View file

@ -40,6 +40,7 @@ import ru.spcex.platform.utils.number.BigDecimalUtil;
import ru.spcex.platform.utils.time.TimeUtil; import ru.spcex.platform.utils.time.TimeUtil;
import java.time.Instant; import java.time.Instant;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.util.*; import java.util.*;
import java.util.function.Function; import java.util.function.Function;
@ -100,7 +101,9 @@ public class FormingPaymentInstructionDealsFinalMkr implements ISessionStage {
RegistryCodeSqlBuilder registryCodeSqlBuilder = RegistryCodeSqlBuilder.getInstance( RegistryCodeSqlBuilder registryCodeSqlBuilder = RegistryCodeSqlBuilder.getInstance(
LM_T, CM_T LM_T, CM_T
); );
ImdgPredicate rgsCodePrdct = rgsPb.sql(registryCodeSqlBuilder.build()); ImdgPredicate rgsCodePrdct = rgsPb.and(
rgsPb.sql(registryCodeSqlBuilder.build()),
rgsPb.equals("settlementDate", LocalDate.now()));
Collection<Registry> registries = registryImdg.getCollectionObjectsByPredicate(rgsCodePrdct); Collection<Registry> registries = registryImdg.getCollectionObjectsByPredicate(rgsCodePrdct);
return registries.stream() return registries.stream()
.filter(rgs -> Objects.equals(rgs.getValueDate(), rgs.getSettlementDate())) .filter(rgs -> Objects.equals(rgs.getValueDate(), rgs.getSettlementDate()))

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

@ -138,9 +138,9 @@ public class FormingPaymentInstructionReturnMkr implements ISessionStage {
for (Registry relatedRegistry : relatedRegistries) { for (Registry relatedRegistry : relatedRegistries) {
if (equalsByRegistry(AM_T, relatedRegistry)) { if (equalsByRegistry(AM_T, relatedRegistry)) {
relatedRegistry.setSettledDebit(safeBD(relatedRegistry.getSettledDebit()).add(safeBD(requirementByMoney.getBalance()))); relatedRegistry.setSettledDebit(safeBD(relatedRegistry.getSettledDebit()).add(safeBD(requirementByMoney.getBalance())));
log.trace("updated related registry.id={} for CM*T.id={}", relatedRegistry.getId(), requirementByMoney.getId());
registryImdg.update(relatedRegistry);
} }
log.trace("updated related registry.id={} for CM*T.id={}", relatedRegistry.getId(), requirementByMoney.getId());
registryImdg.update(relatedRegistry);
} }
} }
@ -149,22 +149,22 @@ public class FormingPaymentInstructionReturnMkr implements ISessionStage {
List<Registry> allLiabilities = rgsAll List<Registry> allLiabilities = rgsAll
.stream() .stream()
.filter(registry -> RegistryDesignation.L.equalsByKey(registry.getRegistryDesignation())) .filter(registry -> RegistryDesignation.L.equalsByKey(registry.getRegistryDesignation()))
//.filter(obligation -> { .filter(obligation -> {
// //если valueDate < settlement date //если valueDate < settlement date
// if (!(obligation.getValueDate() != null if (!(obligation.getValueDate() != null
// && obligation.getSettlementDate() != null && obligation.getSettlementDate() != null
// && obligation.getValueDate().isBefore(obligation.getSettlementDate()))) { && obligation.getValueDate().isBefore(obligation.getSettlementDate()))) {
// return true; return false;
// } }
// Optional<Registry> dmx = searchDmx(obligation); Optional<Registry> dmx = searchDmx(obligation);
// if (dmx.isPresent()) { if (dmx.isPresent()) {
// log.debug("LM*T#id={}, DM*X#id={} found, no action needed for group {}, skipping liability", log.debug("LM*T#id={}, DM*X#id={} found, no action needed for group {}, skipping liability",
// obligation.getId(), obligation.getId(),
// obligation.getId(), obligation.getId(),
// obligation.getGroupId()); obligation.getGroupId());
// } }
// return dmx.isEmpty(); return dmx.isEmpty();
//}) })
.toList(); .toList();
for (int i = 0; i < allLiabilities.size(); i++) { for (int i = 0; i < allLiabilities.size(); i++) {
//сортировка чтобы найти сделки с одинаковыми направлениями и адресатами и схлопнуть в одну //сортировка чтобы найти сделки с одинаковыми направлениями и адресатами и схлопнуть в одну