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

UNIT session fix: adjust value/5 step returns/inclusion conditions

Browse source
This commit is contained in:
ialbert 2024-06-20 19:22:38 +03:00
parent 1b0672bba3
commit ae87df9e86
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -227,8 +227,8 @@ public class UnitedSession extends AbstractSession implements InitializingBean {
InspectionPoolPayload companyIdPayload = new InspectionPoolPayload(); InspectionPoolPayload companyIdPayload = new InspectionPoolPayload();
companyIdPayload.setSessionId(currSession.getId()); companyIdPayload.setSessionId(currSession.getId());
companyIdPayload.setProcessedCompanyId(currSession.getCompanyId()); companyIdPayload.setProcessedCompanyId(currSession.getCompanyId());
//fixme checks inside the stages //fixme checks inside the stages
runStage(TaskType.InspectionObligations, companyIdPayload, inspectionObligationsReturn); //runStage(TaskType.InspectionObligations, companyIdPayload, inspectionObligationsReturn);
runStage(TaskType.InspectionObligations, companyIdPayload, inspectionObligations); runStage(TaskType.InspectionObligations, companyIdPayload, inspectionObligations);
} }

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

@ -356,6 +356,7 @@ public class FormingPaymentInstructionAssets implements ISessionStage {
} }
private BigDecimal adjustAmountByReturns(Registry amb, Long sessionId) {//companyid, tcr/account, sessionId, RUB private BigDecimal adjustAmountByReturns(Registry amb, Long sessionId) {//companyid, tcr/account, sessionId, RUB
if (SessionType.UNIT.equals(sessionType)) return BigDecimal.ZERO;
Long companyId = amb.getCompanyId(); Long companyId = amb.getCompanyId();
Long tradingClearingRegistryId = amb.getTradingClearingRegistryId(); Long tradingClearingRegistryId = amb.getTradingClearingRegistryId();
ImdgPredicateBuilder pb = registryImdg.predicateBuilder(); ImdgPredicateBuilder pb = registryImdg.predicateBuilder();

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

@ -117,6 +117,7 @@ public class InclusionObligations implements ISessionStage {
} else { } else {
registryPredicate = prdctBuilder.and( registryPredicate = prdctBuilder.and(
defaultCondition, defaultCondition,
SessionType.UNIT.equals(sessionType) ? prdctBuilder.equals("sessionId", sessionId) : prdctBuilder.alwaysTrue(),
prdctBuilder.equals("registryStatus", RegistryStatus.PROC.getKey()) prdctBuilder.equals("registryStatus", RegistryStatus.PROC.getKey())
); );
} }