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

http://jira.mfd.msk:8088/browse/CLS-444

Browse source 
http://jira.mfd.msk:8088/browse/CLS-445
This commit is contained in:
ialbert 2023-07-27 11:54:24 +03:00
parent 9518c7130a
commit c92dc63fa8
5 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -33,7 +33,7 @@ public class RegistryManager {
this.rgsImdg = rgsImdg; this.rgsImdg = rgsImdg;
} }
public Optional<Registry> searchDmx(Registry rgs) { public Optional<Registry> searchDmxByCounterParty(Registry rgs) {
if (TextUtil.isEmpty(rgs.getContract())) return Optional.empty(); if (TextUtil.isEmpty(rgs.getContract())) return Optional.empty();
String sqlCondition = String.format("(%s) and companyId = %d and contract = '%s'", String sqlCondition = String.format("(%s) and companyId = %d and contract = '%s'",
RegistryCodeSqlBuilder.getInstance(DM_X).build(), RegistryCodeSqlBuilder.getInstance(DM_X).build(),
@ -43,6 +43,16 @@ public class RegistryManager {
return Optional.ofNullable(dmx); return Optional.ofNullable(dmx);
} }
public Optional<Registry> searchDmxByCompanyId(Registry rgs) {
if (TextUtil.isEmpty(rgs.getContract())) return Optional.empty();
String sqlCondition = String.format("(%s) and companyId = %d and contract = '%s'",
RegistryCodeSqlBuilder.getInstance(DM_X).build(),
rgs.getCompanyId(),
rgs.getContract());
Registry dmx = rgsImdg.getFirstObjectBySQL(sqlCondition);
return Optional.ofNullable(dmx);
}
public Optional<Registry> searchDmtInfo(Registry rgs) { public Optional<Registry> searchDmtInfo(Registry rgs) {
if (TextUtil.isEmpty(rgs.getContract())) return Optional.empty(); if (TextUtil.isEmpty(rgs.getContract())) return Optional.empty();
String sqlCondition = String.format("(%s) and accountType='%s' and companyId = %d and counterPartyId = %d and contract = '%s'", String sqlCondition = String.format("(%s) and accountType='%s' and companyId = %d and counterPartyId = %d and contract = '%s'",

2
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/validation/ReturnDepositValidationRule.java
View file

@ -45,7 +45,7 @@ public enum ReturnDepositValidationRule implements IValidationRule<ImdgValidatio
Registry rgs = context.getStoredObject(Stored.PresentById); Registry rgs = context.getStoredObject(Stored.PresentById);
Imdg<Registry> rgsImdg = context.obtainMap(IMDGDistributedNames.Map_Registry, Registry.class); Imdg<Registry> rgsImdg = context.obtainMap(IMDGDistributedNames.Map_Registry, Registry.class);
RegistryManager rgsMng = new RegistryManager(rgsImdg); RegistryManager rgsMng = new RegistryManager(rgsImdg);
Optional<Registry> dmx = rgsMng.searchDmx(rgs); Optional<Registry> dmx = rgsMng.searchDmxByCompanyId(rgs);
if (dmx.isPresent() && RegistryStatus.OK.equalsByKey(dmx.get().getRegistryStatus()) ) { if (dmx.isPresent() && RegistryStatus.OK.equalsByKey(dmx.get().getRegistryStatus()) ) {
return of(ClearingError.ObligationsAlreadyCalculated); return of(ClearingError.ObligationsAlreadyCalculated);
} }

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

@ -125,7 +125,7 @@ public class FormingPaymentInstructionDepositReturn implements ISessionStage {
} }
Registry lm_t = lmtO.get(); //obligation by money Registry lm_t = lmtO.get(); //obligation by money
Registry cm_t = cmtO.get(); Registry cm_t = cmtO.get();
Optional<Registry> dmx = rgsMng.searchDmx(lm_t); Optional<Registry> dmx = rgsMng.searchDmxByCounterParty(lm_t);
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",
lm_t.getId(), dmx.get().getId(), lm_t.getGroupId()); lm_t.getId(), dmx.get().getId(), lm_t.getGroupId());

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

@ -142,7 +142,7 @@ public class FormingPaymentInstructionReturnMkr implements ISessionStage {
} }
Registry lm_t = lmtO.get(); //obligation by money Registry lm_t = lmtO.get(); //obligation by money
Registry cm_t = cmtO.get(); Registry cm_t = cmtO.get();
Optional<Registry> dmx = rgsMng.searchDmx(lm_t); Optional<Registry> dmx = rgsMng.searchDmxByCounterParty(lm_t);
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",
lm_t.getId(), dmx.get().getId(), lm_t.getGroupId()); lm_t.getId(), dmx.get().getId(), lm_t.getGroupId());

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

@ -87,7 +87,7 @@ public class InspectionObligationsDepositReturn implements ISessionStage {
} }
//вторая часть сделки - возврат депозита //вторая часть сделки - возврат депозита
Optional<Registry> dmx = rgsMng.searchDmx(omtRgs); Optional<Registry> dmx = rgsMng.searchDmxByCounterParty(omtRgs);
if (dmx.isPresent()) { if (dmx.isPresent()) {
BigDecimal dmxBalance = safeBD(dmx.get().getBalance()); BigDecimal dmxBalance = safeBD(dmx.get().getBalance());
log.debug("OM*T.id={} -> DM*X.id={}, dmxBalance={}, omtBalance={}", log.debug("OM*T.id={} -> DM*X.id={}, dmxBalance={}, omtBalance={}",