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

выпилил из шага с PaymentInstruction блокировку активов

Browse source
This commit is contained in:
ialbert 2023-08-01 14:49:10 +03:00
parent 89e8f2dae7
commit 241f88199d
3 changed files with 148 additions and 145 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionB0Session.java
View file

@ -39,8 +39,9 @@ public class PrimaryAuctionB0Session extends AbstractSession implements Initiali
private final InclusionObligations inclusionObligations; private final InclusionObligations inclusionObligations;
private final InspectionObligations inspectionObligations; private final InspectionObligations inspectionObligations;
private final FormingRegistersOnOS formingRegistersOnOS; private final FormingRegistersOnOS formingRegistersOnOS;
private final FormingPaymentInstruction formingPaymentInstruction; private final FormingPaymentInstructionAssets formingPaymentInstruction;
private final FormingPaymentInstructionDealsFinalMkr formingPaymentInstructionDealsFinalMkr; //TODO CLRNWORM
//private final FormingPaymentInstructionDealsFinalMkr formingPaymentInstructionDealsFinalMkr;
private final UnlockResources unlockResources; private final UnlockResources unlockResources;
private final FinishingSession finishingSession; private final FinishingSession finishingSession;
private final EndStageNotification endStageNotification; private final EndStageNotification endStageNotification;
@ -57,8 +58,8 @@ public class PrimaryAuctionB0Session extends AbstractSession implements Initiali
ObligationAdmission obligationsAdmission, ObligationAdmission obligationsAdmission,
InclusionObligations inclusionObligations, InclusionObligations inclusionObligations,
FormingRegistersOnOS formingRegistersOnOS, FormingRegistersOnOS formingRegistersOnOS,
FormingPaymentInstruction formingPaymentInstruction, FormingPaymentInstructionAssets formingPaymentInstruction,
FormingPaymentInstructionDealsFinalMkr formingPaymentInstructionDealsFinalMkr, // FormingPaymentInstructionDealsFinalMkr formingPaymentInstructionDealsFinalMkr,
UnlockResources unlockResources, UnlockResources unlockResources,
FinishingSession finishingSession, FinishingSession finishingSession,
EndStageNotification endStageNotification, EndStageNotification endStageNotification,
@ -78,7 +79,7 @@ public class PrimaryAuctionB0Session extends AbstractSession implements Initiali
this.endStageNotification = endStageNotification; this.endStageNotification = endStageNotification;
this.executionFondImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_ExecutionFond, ExecutionFond.class); this.executionFondImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_ExecutionFond, ExecutionFond.class);
this.inspectionObligations = inspectionObligations; this.inspectionObligations = inspectionObligations;
this.formingPaymentInstructionDealsFinalMkr = formingPaymentInstructionDealsFinalMkr; // this.formingPaymentInstructionDealsFinalMkr = formingPaymentInstructionDealsFinalMkr;
this.marketCodes = marketCodes; this.marketCodes = marketCodes;
} }
@ -149,6 +150,7 @@ public class PrimaryAuctionB0Session extends AbstractSession implements Initiali
{ {
InspectionPoolPayload companyIdPayload = new InspectionPoolPayload(); InspectionPoolPayload companyIdPayload = new InspectionPoolPayload();
companyIdPayload.setProcessedCompanyId(currSession.getCompanyId()); companyIdPayload.setProcessedCompanyId(currSession.getCompanyId());
companyIdPayload.setSessionId(currSession.getId());
runStage(TaskType.InspectionObligations, companyIdPayload, inspectionObligations); runStage(TaskType.InspectionObligations, companyIdPayload, inspectionObligations);
} }
//stage 6 //stage 6
@ -157,23 +159,23 @@ public class PrimaryAuctionB0Session extends AbstractSession implements Initiali
payload.setSessionId(currSession.getId()); payload.setSessionId(currSession.getId());
runStage(TaskType.FormingRegistersOnOS, payload, formingRegistersOnOS); //returns Collection<Registry> runStage(TaskType.FormingRegistersOnOS, payload, formingRegistersOnOS); //returns Collection<Registry>
} }
StageResult<Collection<PaymentInstruction>> returnsPayment = null; StageResult<Collection<PaymentInstruction>> paymentResult = null;
{ {
FormingPaymentInstructionPayload payload = new FormingPaymentInstructionPayload(); FormingPaymentInstructionPayload payload = new FormingPaymentInstructionPayload();
payload.setSessionId(currSession.getId()); payload.setSessionId(currSession.getId());
//stage 7 //stage 7
returnsPayment = runStage(TaskType.FormingPaymentInstruction, payload, formingPaymentInstruction); paymentResult = runStage(TaskType.FormingPaymentInstruction, payload, formingPaymentInstruction);
} }
//stage 7 //stage 7
StageResult<Collection<PaymentInstruction>> paymentResult = null; // StageResult<Collection<PaymentInstruction>> paymentResult = null;
{ // {
FormingPaymentInstructionDealsMkrPayload payload = new FormingPaymentInstructionDealsMkrPayload(); // FormingPaymentInstructionDealsMkrPayload payload = new FormingPaymentInstructionDealsMkrPayload();
payload.setSessionId(currSession.getId()); // payload.setSessionId(currSession.getId());
payload.setSection(section()); // payload.setSection(section());
payload.setPaymentInstructionReturns(returnsPayment.getStageResult()); // payload.setPaymentInstructionReturns(returnsPayment.getStageResult());
//
paymentResult = runStage(TaskType.FormingPaymentInstruction, payload, formingPaymentInstructionDealsFinalMkr); // paymentResult = runStage(TaskType.FormingPaymentInstruction, payload, formingPaymentInstructionDealsFinalMkr);
} // }
if (paymentResult != null && paymentResult.getStageResult().isEmpty()) { if (paymentResult != null && paymentResult.getStageResult().isEmpty()) {
runStage(TaskType.FormingPaymentInstruction, balanceRevise); runStage(TaskType.FormingPaymentInstruction, balanceRevise);
// finishPart(req); // finishPart(req);

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

@ -107,134 +107,135 @@ public class FormingPaymentInstruction implements ISessionStage {
.toList(); .toList();
log.debug("Size obligationsByMoney: {}; expected 0", obligationsByMoney.size()); log.debug("Size obligationsByMoney: {}; expected 0", obligationsByMoney.size());
for (Registry obligationByMoney : obligationsByMoney) { //TODO CLRNWORM
String sql = String.format("tradingClearingRegistryId = %s and companyId = %s", // for (Registry obligationByMoney : obligationsByMoney) {
obligationByMoney.getTradingClearingRegistryId(), obligationByMoney.getCompanyId()); // String sql = String.format("tradingClearingRegistryId = %s and companyId = %s",
Collection<Registry> relatedRegistries = registryImdg.getCollectionObjectsBySQL(sql); // obligationByMoney.getTradingClearingRegistryId(), obligationByMoney.getCompanyId());
// Collection<Registry> relatedRegistries = registryImdg.getCollectionObjectsBySQL(sql);
RegistryTradingParams registryTradingParamsF = new RegistryTradingParams(RegistryDesignation.A, //
RegistryInstrumentType.M, null, RegistryUnit.F); // RegistryTradingParams registryTradingParamsF = new RegistryTradingParams(RegistryDesignation.A,
RegistryTradingParams registryTradingParamsT = new RegistryTradingParams(RegistryDesignation.A, // RegistryInstrumentType.M, null, RegistryUnit.F);
RegistryInstrumentType.M, null, RegistryUnit.T); // RegistryTradingParams registryTradingParamsT = new RegistryTradingParams(RegistryDesignation.A,
RegistryTradingParams registryTradingParamsB = new RegistryTradingParams(RegistryDesignation.A, // RegistryInstrumentType.M, null, RegistryUnit.T);
RegistryInstrumentType.M, null, RegistryUnit.B); // RegistryTradingParams registryTradingParamsB = new RegistryTradingParams(RegistryDesignation.A,
// RegistryInstrumentType.M, null, RegistryUnit.B);
for (Registry relatedRegistry : relatedRegistries) { //
if (registryTradingParamsF.equalByRegistry(IEnumKey.getEnumByKey(RegistryDesignation.class, relatedRegistry.getRegistryDesignation()), // for (Registry relatedRegistry : relatedRegistries) {
IEnumKey.getEnumByKey(RegistryInstrumentType.class, relatedRegistry.getRegistryInstrumentType()), // if (registryTradingParamsF.equalByRegistry(IEnumKey.getEnumByKey(RegistryDesignation.class, relatedRegistry.getRegistryDesignation()),
IEnumKey.getEnumByKey(RegistryCapacity.class, relatedRegistry.getRegistryCapacity()), // IEnumKey.getEnumByKey(RegistryInstrumentType.class, relatedRegistry.getRegistryInstrumentType()),
IEnumKey.getEnumByKey(RegistryUnit.class, relatedRegistry.getRegistryUnit()))) { // IEnumKey.getEnumByKey(RegistryCapacity.class, relatedRegistry.getRegistryCapacity()),
relatedRegistry.setBalance(safeBD(relatedRegistry.getBalance()).subtract(safeBD(obligationByMoney.getBalance()))); // IEnumKey.getEnumByKey(RegistryUnit.class, relatedRegistry.getRegistryUnit()))) {
} else if (registryTradingParamsT.equalByRegistry(IEnumKey.getEnumByKey(RegistryDesignation.class, relatedRegistry.getRegistryDesignation()), // relatedRegistry.setBalance(safeBD(relatedRegistry.getBalance()).subtract(safeBD(obligationByMoney.getBalance())));
IEnumKey.getEnumByKey(RegistryInstrumentType.class, relatedRegistry.getRegistryInstrumentType()), // } else if (registryTradingParamsT.equalByRegistry(IEnumKey.getEnumByKey(RegistryDesignation.class, relatedRegistry.getRegistryDesignation()),
IEnumKey.getEnumByKey(RegistryCapacity.class, relatedRegistry.getRegistryCapacity()), // IEnumKey.getEnumByKey(RegistryInstrumentType.class, relatedRegistry.getRegistryInstrumentType()),
IEnumKey.getEnumByKey(RegistryUnit.class, relatedRegistry.getRegistryUnit()))) { // IEnumKey.getEnumByKey(RegistryCapacity.class, relatedRegistry.getRegistryCapacity()),
relatedRegistry.setSettledDebit(safeBD(relatedRegistry.getSettledDebit()).add(safeBD(obligationByMoney.getBalance()))); // IEnumKey.getEnumByKey(RegistryUnit.class, relatedRegistry.getRegistryUnit()))) {
} else if (registryTradingParamsB.equalByRegistry(IEnumKey.getEnumByKey(RegistryDesignation.class, relatedRegistry.getRegistryDesignation()), // relatedRegistry.setSettledDebit(safeBD(relatedRegistry.getSettledDebit()).add(safeBD(obligationByMoney.getBalance())));
IEnumKey.getEnumByKey(RegistryInstrumentType.class, relatedRegistry.getRegistryInstrumentType()), // } else if (registryTradingParamsB.equalByRegistry(IEnumKey.getEnumByKey(RegistryDesignation.class, relatedRegistry.getRegistryDesignation()),
IEnumKey.getEnumByKey(RegistryCapacity.class, relatedRegistry.getRegistryCapacity()), // IEnumKey.getEnumByKey(RegistryInstrumentType.class, relatedRegistry.getRegistryInstrumentType()),
IEnumKey.getEnumByKey(RegistryUnit.class, relatedRegistry.getRegistryUnit()))) { // IEnumKey.getEnumByKey(RegistryCapacity.class, relatedRegistry.getRegistryCapacity()),
relatedRegistry.setBalance(safeBD(relatedRegistry.getBalance()).add(safeBD(obligationByMoney.getBalance()))); // IEnumKey.getEnumByKey(RegistryUnit.class, relatedRegistry.getRegistryUnit()))) {
} // relatedRegistry.setBalance(safeBD(relatedRegistry.getBalance()).add(safeBD(obligationByMoney.getBalance())));
registryImdg.update(relatedRegistry); // }
} // registryImdg.update(relatedRegistry);
} // }
// }
List<Registry> requirementsByIssue = obligations.stream().filter(registry -> //
new RegistryTradingParams(RegistryDesignation.C, RegistryInstrumentType.S, null, RegistryUnit.T).equalByRegistry(IEnumKey.getEnumByKey(RegistryDesignation.class, registry.getRegistryDesignation()), // List<Registry> requirementsByIssue = obligations.stream().filter(registry ->
IEnumKey.getEnumByKey(RegistryInstrumentType.class, registry.getRegistryInstrumentType()), // new RegistryTradingParams(RegistryDesignation.C, RegistryInstrumentType.S, null, RegistryUnit.T).equalByRegistry(IEnumKey.getEnumByKey(RegistryDesignation.class, registry.getRegistryDesignation()),
IEnumKey.getEnumByKey(RegistryCapacity.class, registry.getRegistryCapacity()), // IEnumKey.getEnumByKey(RegistryInstrumentType.class, registry.getRegistryInstrumentType()),
IEnumKey.getEnumByKey(RegistryUnit.class, registry.getRegistryUnit()))) // IEnumKey.getEnumByKey(RegistryCapacity.class, registry.getRegistryCapacity()),
.toList(); // IEnumKey.getEnumByKey(RegistryUnit.class, registry.getRegistryUnit())))
// .toList();
log.debug("Size requirementsByIssue: {};", requirementsByIssue.size()); //
for (Registry requirementByIssue : requirementsByIssue) { // log.debug("Size requirementsByIssue: {};", requirementsByIssue.size());
String sql = String.format("tradingClearingRegistryId = %s and companyId = %s", // for (Registry requirementByIssue : requirementsByIssue) {
requirementByIssue.getTradingClearingRegistryId(), requirementByIssue.getCompanyId()); // String sql = String.format("tradingClearingRegistryId = %s and companyId = %s",
Collection<Registry> relatedRegistries = registryImdg.getCollectionObjectsBySQL(sql); // requirementByIssue.getTradingClearingRegistryId(), requirementByIssue.getCompanyId());
// Collection<Registry> relatedRegistries = registryImdg.getCollectionObjectsBySQL(sql);
RegistryTradingParams registryTradingParamsA = new RegistryTradingParams(RegistryDesignation.A, //
RegistryInstrumentType.S, null, RegistryUnit.T); // RegistryTradingParams registryTradingParamsA = new RegistryTradingParams(RegistryDesignation.A,
// RegistryInstrumentType.S, null, RegistryUnit.T);
for (Registry relatedRegistry : relatedRegistries) { //
if (registryTradingParamsA.equalByRegistry(IEnumKey.getEnumByKey(RegistryDesignation.class, relatedRegistry.getRegistryDesignation()), // for (Registry relatedRegistry : relatedRegistries) {
IEnumKey.getEnumByKey(RegistryInstrumentType.class, relatedRegistry.getRegistryInstrumentType()), // if (registryTradingParamsA.equalByRegistry(IEnumKey.getEnumByKey(RegistryDesignation.class, relatedRegistry.getRegistryDesignation()),
IEnumKey.getEnumByKey(RegistryCapacity.class, relatedRegistry.getRegistryCapacity()), // IEnumKey.getEnumByKey(RegistryInstrumentType.class, relatedRegistry.getRegistryInstrumentType()),
IEnumKey.getEnumByKey(RegistryUnit.class, relatedRegistry.getRegistryUnit()))) { // IEnumKey.getEnumByKey(RegistryCapacity.class, relatedRegistry.getRegistryCapacity()),
relatedRegistry.setSettledDebit(safeBD(relatedRegistry.getSettledDebit()).add(safeBD(requirementByIssue.getBalance()))); // IEnumKey.getEnumByKey(RegistryUnit.class, relatedRegistry.getRegistryUnit()))) {
} // relatedRegistry.setSettledDebit(safeBD(relatedRegistry.getSettledDebit()).add(safeBD(requirementByIssue.getBalance())));
registryImdg.update(relatedRegistry); // }
} // registryImdg.update(relatedRegistry);
} // }
// }
List<Registry> requirementsByMoney = obligations.stream().filter(registry -> //
new RegistryTradingParams(RegistryDesignation.C, RegistryInstrumentType.M, null, RegistryUnit.T).equalByRegistry( // List<Registry> requirementsByMoney = obligations.stream().filter(registry ->
IEnumKey.getEnumByKey(RegistryDesignation.class, registry.getRegistryDesignation()), // new RegistryTradingParams(RegistryDesignation.C, RegistryInstrumentType.M, null, RegistryUnit.T).equalByRegistry(
IEnumKey.getEnumByKey(RegistryInstrumentType.class, registry.getRegistryInstrumentType()), // IEnumKey.getEnumByKey(RegistryDesignation.class, registry.getRegistryDesignation()),
IEnumKey.getEnumByKey(RegistryCapacity.class, registry.getRegistryCapacity()), // IEnumKey.getEnumByKey(RegistryInstrumentType.class, registry.getRegistryInstrumentType()),
IEnumKey.getEnumByKey(RegistryUnit.class, registry.getRegistryUnit()))) // IEnumKey.getEnumByKey(RegistryCapacity.class, registry.getRegistryCapacity()),
.toList(); // IEnumKey.getEnumByKey(RegistryUnit.class, registry.getRegistryUnit())))
// .toList();
log.debug("Size requirementsByMoney: {}; expected 0", requirementsByMoney.size()); //
for (Registry requirementByMoney : requirementsByMoney) { // log.debug("Size requirementsByMoney: {}; expected 0", requirementsByMoney.size());
String sql = String.format("tradingClearingRegistryId = %s and companyId = %s", // for (Registry requirementByMoney : requirementsByMoney) {
requirementByMoney.getTradingClearingRegistryId(), requirementByMoney.getCompanyId()); // String sql = String.format("tradingClearingRegistryId = %s and companyId = %s",
Collection<Registry> relatedRegistries = registryImdg.getCollectionObjectsBySQL(sql); // requirementByMoney.getTradingClearingRegistryId(), requirementByMoney.getCompanyId());
// Collection<Registry> relatedRegistries = registryImdg.getCollectionObjectsBySQL(sql);
RegistryTradingParams registryTradingParamsA = new RegistryTradingParams(RegistryDesignation.A, //
RegistryInstrumentType.M, null, RegistryUnit.T); // RegistryTradingParams registryTradingParamsA = new RegistryTradingParams(RegistryDesignation.A,
// RegistryInstrumentType.M, null, RegistryUnit.T);
for (Registry relatedRegistry : relatedRegistries) { //
if (registryTradingParamsA.equalByRegistry(IEnumKey.getEnumByKey(RegistryDesignation.class, relatedRegistry.getRegistryDesignation()), // for (Registry relatedRegistry : relatedRegistries) {
IEnumKey.getEnumByKey(RegistryInstrumentType.class, relatedRegistry.getRegistryInstrumentType()), // if (registryTradingParamsA.equalByRegistry(IEnumKey.getEnumByKey(RegistryDesignation.class, relatedRegistry.getRegistryDesignation()),
IEnumKey.getEnumByKey(RegistryCapacity.class, relatedRegistry.getRegistryCapacity()), // IEnumKey.getEnumByKey(RegistryInstrumentType.class, relatedRegistry.getRegistryInstrumentType()),
IEnumKey.getEnumByKey(RegistryUnit.class, relatedRegistry.getRegistryUnit()))) { // IEnumKey.getEnumByKey(RegistryCapacity.class, relatedRegistry.getRegistryCapacity()),
relatedRegistry.setSettledDebit(safeBD(relatedRegistry.getSettledDebit()).add(safeBD(requirementByMoney.getBalance()))); // IEnumKey.getEnumByKey(RegistryUnit.class, relatedRegistry.getRegistryUnit()))) {
} // relatedRegistry.setSettledDebit(safeBD(relatedRegistry.getSettledDebit()).add(safeBD(requirementByMoney.getBalance())));
registryImdg.update(relatedRegistry); // }
} // registryImdg.update(relatedRegistry);
} // }
// }
List<Registry> obligationsByIssue = obligations.stream().filter(registry -> //
new RegistryTradingParams(RegistryDesignation.L, RegistryInstrumentType.S, null, RegistryUnit.T).equalByRegistry( // List<Registry> obligationsByIssue = obligations.stream().filter(registry ->
IEnumKey.getEnumByKey(RegistryDesignation.class, registry.getRegistryDesignation()), // new RegistryTradingParams(RegistryDesignation.L, RegistryInstrumentType.S, null, RegistryUnit.T).equalByRegistry(
IEnumKey.getEnumByKey(RegistryInstrumentType.class, registry.getRegistryInstrumentType()), // IEnumKey.getEnumByKey(RegistryDesignation.class, registry.getRegistryDesignation()),
IEnumKey.getEnumByKey(RegistryCapacity.class, registry.getRegistryCapacity()), // IEnumKey.getEnumByKey(RegistryInstrumentType.class, registry.getRegistryInstrumentType()),
IEnumKey.getEnumByKey(RegistryUnit.class, registry.getRegistryUnit()))) // IEnumKey.getEnumByKey(RegistryCapacity.class, registry.getRegistryCapacity()),
.toList(); // IEnumKey.getEnumByKey(RegistryUnit.class, registry.getRegistryUnit())))
// .toList();
for (Registry obligationByIssue : obligationsByIssue) { //
String sql = String.format("tradingClearingRegistryId = %s and companyId = %s", // for (Registry obligationByIssue : obligationsByIssue) {
obligationByIssue.getTradingClearingRegistryId(), obligationByIssue.getCompanyId()); // String sql = String.format("tradingClearingRegistryId = %s and companyId = %s",
Collection<Registry> relatedRegistries = registryImdg.getCollectionObjectsBySQL(sql); // obligationByIssue.getTradingClearingRegistryId(), obligationByIssue.getCompanyId());
// Collection<Registry> relatedRegistries = registryImdg.getCollectionObjectsBySQL(sql);
RegistryTradingParams registryTradingParamsF = new RegistryTradingParams(RegistryDesignation.A, //
RegistryInstrumentType.S, null, RegistryUnit.F); // RegistryTradingParams registryTradingParamsF = new RegistryTradingParams(RegistryDesignation.A,
RegistryTradingParams registryTradingParamsT = new RegistryTradingParams(RegistryDesignation.A, // RegistryInstrumentType.S, null, RegistryUnit.F);
RegistryInstrumentType.S, null, RegistryUnit.T); // RegistryTradingParams registryTradingParamsT = new RegistryTradingParams(RegistryDesignation.A,
RegistryTradingParams registryTradingParamsB = new RegistryTradingParams(RegistryDesignation.A, // RegistryInstrumentType.S, null, RegistryUnit.T);
RegistryInstrumentType.S, null, RegistryUnit.B); // RegistryTradingParams registryTradingParamsB = new RegistryTradingParams(RegistryDesignation.A,
// RegistryInstrumentType.S, null, RegistryUnit.B);
for (Registry relatedRegistry : relatedRegistries) { //
if (registryTradingParamsF.equalByRegistry(IEnumKey.getEnumByKey(RegistryDesignation.class, relatedRegistry.getRegistryDesignation()), // for (Registry relatedRegistry : relatedRegistries) {
IEnumKey.getEnumByKey(RegistryInstrumentType.class, relatedRegistry.getRegistryInstrumentType()), // if (registryTradingParamsF.equalByRegistry(IEnumKey.getEnumByKey(RegistryDesignation.class, relatedRegistry.getRegistryDesignation()),
IEnumKey.getEnumByKey(RegistryCapacity.class, relatedRegistry.getRegistryCapacity()), // IEnumKey.getEnumByKey(RegistryInstrumentType.class, relatedRegistry.getRegistryInstrumentType()),
IEnumKey.getEnumByKey(RegistryUnit.class, relatedRegistry.getRegistryUnit()))) { // IEnumKey.getEnumByKey(RegistryCapacity.class, relatedRegistry.getRegistryCapacity()),
relatedRegistry.setBalance(safeBD(relatedRegistry.getBalance()).subtract(safeBD(obligationByIssue.getBalance()))); // IEnumKey.getEnumByKey(RegistryUnit.class, relatedRegistry.getRegistryUnit()))) {
} else if (registryTradingParamsT.equalByRegistry(IEnumKey.getEnumByKey(RegistryDesignation.class, relatedRegistry.getRegistryDesignation()), // relatedRegistry.setBalance(safeBD(relatedRegistry.getBalance()).subtract(safeBD(obligationByIssue.getBalance())));
IEnumKey.getEnumByKey(RegistryInstrumentType.class, relatedRegistry.getRegistryInstrumentType()), // } else if (registryTradingParamsT.equalByRegistry(IEnumKey.getEnumByKey(RegistryDesignation.class, relatedRegistry.getRegistryDesignation()),
IEnumKey.getEnumByKey(RegistryCapacity.class, relatedRegistry.getRegistryCapacity()), // IEnumKey.getEnumByKey(RegistryInstrumentType.class, relatedRegistry.getRegistryInstrumentType()),
IEnumKey.getEnumByKey(RegistryUnit.class, relatedRegistry.getRegistryUnit()))) { // IEnumKey.getEnumByKey(RegistryCapacity.class, relatedRegistry.getRegistryCapacity()),
relatedRegistry.setSettledDebit(safeBD(relatedRegistry.getSettledDebit()).add(safeBD(obligationByIssue.getBalance()))); // IEnumKey.getEnumByKey(RegistryUnit.class, relatedRegistry.getRegistryUnit()))) {
} else if (registryTradingParamsB.equalByRegistry(IEnumKey.getEnumByKey(RegistryDesignation.class, relatedRegistry.getRegistryDesignation()), // relatedRegistry.setSettledDebit(safeBD(relatedRegistry.getSettledDebit()).add(safeBD(obligationByIssue.getBalance())));
IEnumKey.getEnumByKey(RegistryInstrumentType.class, relatedRegistry.getRegistryInstrumentType()), // } else if (registryTradingParamsB.equalByRegistry(IEnumKey.getEnumByKey(RegistryDesignation.class, relatedRegistry.getRegistryDesignation()),
IEnumKey.getEnumByKey(RegistryCapacity.class, relatedRegistry.getRegistryCapacity()), // IEnumKey.getEnumByKey(RegistryInstrumentType.class, relatedRegistry.getRegistryInstrumentType()),
IEnumKey.getEnumByKey(RegistryUnit.class, relatedRegistry.getRegistryUnit()))) { // IEnumKey.getEnumByKey(RegistryCapacity.class, relatedRegistry.getRegistryCapacity()),
relatedRegistry.setBalance(safeBD(relatedRegistry.getBalance()).add(safeBD(obligationByIssue.getBalance()))); // IEnumKey.getEnumByKey(RegistryUnit.class, relatedRegistry.getRegistryUnit()))) {
} // relatedRegistry.setBalance(safeBD(relatedRegistry.getBalance()).add(safeBD(obligationByIssue.getBalance())));
registryImdg.update(relatedRegistry); // }
} // registryImdg.update(relatedRegistry);
} // }
// }
List<PaymentInstruction> formedPaymentInstructions = new ArrayList<>(); List<PaymentInstruction> formedPaymentInstructions = new ArrayList<>();
Map<RegistryInstrumentType, List<Registry>> registryByInstrumentType = obligations.stream() Map<RegistryInstrumentType, List<Registry>> registryByInstrumentType = obligations.stream()

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

@ -115,7 +115,7 @@ public class InspectionObligations implements ISessionStage {
if (checkResults.stream().noneMatch(checkResult -> checkResult.isUncovered)) { if (checkResults.stream().noneMatch(checkResult -> checkResult.isUncovered)) {
Instant now = Instant.now(); Instant now = Instant.now();
//по каждому регистру OM*T, TM*T, OS*T, TS*T из одной группы //по каждому регистру OM*T, TM*T, OS*T, TS*T из одной группы
for (Registry registry : group) { for (Registry registry : group) {//TODO CLRNWORM проверка на пустой blockedRegistry
Registry blockedRegistry = null; Registry blockedRegistry = null;
if (IEnumKey.getEnumByKey(RegistryInstrumentType.class, registry.getRegistryInstrumentType()) == RegistryInstrumentType.M) { if (IEnumKey.getEnumByKey(RegistryInstrumentType.class, registry.getRegistryInstrumentType()) == RegistryInstrumentType.M) {
String moneyBAssetSql = searchMoneyBAssetsSql(registry); String moneyBAssetSql = searchMoneyBAssetsSql(registry);