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

5 шаг сессии по возврату: поиск DM*T(clnr) условие на контракт

Browse source
This commit is contained in:
ialbert 2023-07-20 16:22:14 +03:00
parent cba1772bf6
commit e1d565522b
2 changed files with 4 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/RegistryManager.java
View file

@ -8,6 +8,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 ru.spcex.platform.imdg.api.predicate.ImdgPredicate; import ru.spcex.platform.imdg.api.predicate.ImdgPredicate;
import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder;
import ru.spcex.platform.imdg.api.predicate.specific.RegistryAssetPredicate; import ru.spcex.platform.imdg.api.predicate.specific.RegistryAssetPredicate;
import ru.spcex.platform.imdg.api.predicate.specific.RegistryCodeSqlBuilder; import ru.spcex.platform.imdg.api.predicate.specific.RegistryCodeSqlBuilder;
import ru.spcex.platform.imdg.api.predicate.specific.RegistryDm_tClrnPredicate; import ru.spcex.platform.imdg.api.predicate.specific.RegistryDm_tClrnPredicate;
@ -54,6 +55,8 @@ public class RegistryManager {
ImdgPredicate dmtClrnPrdct = RegistryDm_tClrnPredicate ImdgPredicate dmtClrnPrdct = RegistryDm_tClrnPredicate
.instance(rgs.getCompanyId(), rgs.getCounterPartyId()) .instance(rgs.getCompanyId(), rgs.getCounterPartyId())
.apply(rgsImdg); .apply(rgsImdg);
ImdgPredicateBuilder rgsPb = rgsImdg.predicateBuilder();
dmtClrnPrdct = rgsPb.and(dmtClrnPrdct, rgsPb.equals("contract", rgs.getContract()));
Registry dmt = rgsImdg.getSingleObjectByPredicate(dmtClrnPrdct); Registry dmt = rgsImdg.getSingleObjectByPredicate(dmtClrnPrdct);
return Optional.ofNullable(dmt); return Optional.ofNullable(dmt);
} }

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

@ -127,7 +127,7 @@ public class InspectionObligationsDepositReturn implements ISessionStage {
} }
continue; continue;
} }
Optional<Registry> dmtClnr = searchDmtClrn(omtRgs); Optional<Registry> dmtClnr = rgsMng.searchDmtClrn(omtRgs);
if (dmtClnr.isPresent()) { if (dmtClnr.isPresent()) {
BigDecimal dmtBalance = safeBD(dmtClnr.get().getBalance()); BigDecimal dmtBalance = safeBD(dmtClnr.get().getBalance());
log.debug("OM*T.id={} -> DM*T(CLNR).id={}, dmtBalance={}, omtBalance={}, amfBalance={}", log.debug("OM*T.id={} -> DM*T(CLNR).id={}, dmtBalance={}, omtBalance={}, amfBalance={}",
@ -156,19 +156,6 @@ public class InspectionObligationsDepositReturn implements ISessionStage {
registryImdg.update(registry); registryImdg.update(registry);
} }
/**
* Если УК зачисляет средства на свой ТБС
*/
private Optional<Registry> searchDmtClrn(Registry rgs) {
String sqlCondition = String.format("(%s) and accountType='%s' and companyId = %d and counterPartyId = %d",
RegistryCodeSqlBuilder.getInstance(DM_T).build(),
AccountType.Clrn.getKey(),
rgs.getCompanyId(),
rgs.getCounterPartyId());
Registry dmt = registryImdg.getFirstObjectBySQL(sqlCondition);
return Optional.ofNullable(dmt);
}
private Optional<Registry> searchAssetByOMT(Registry obligation) { private Optional<Registry> searchAssetByOMT(Registry obligation) {
String sqlCondition = String.format("%s and " + String sqlCondition = String.format("%s and " +
"tradingClearingRegistryId = '%s' and " + "tradingClearingRegistryId = '%s' and " +