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

UNIT session config bugfix

Browse source 
XDEP inclusion to pool selection bugfix
PAYM inclusion to pool selection bugfix
This commit is contained in:
ialbert 2025-07-08 14:54:02 +03:00
parent db9963b337
commit 4e50f77576
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/UnitedSessionStateMachineConfig.java
View file

@ -126,6 +126,7 @@ public class UnitedSessionStateMachineConfig
dealsPrepareFinal.addExecutionDepositCondition(pb.regex("firstLegSettlementCode", "^T0.*$")); dealsPrepareFinal.addExecutionDepositCondition(pb.regex("firstLegSettlementCode", "^T0.*$"));
this.finishingSessionAction.setPr("1"); this.finishingSessionAction.setPr("1");
this.obligationAdmissionContinueAction.setDataEnum(DataEnum.obligationAdmissionStashedRgs);
} }
} }

7
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/state/action/InclusionToPoolAction.java
View file

@ -102,7 +102,7 @@ public class InclusionToPoolAction extends AbstractSessionActionForOkErrorHandli
RegistryUnit.T.getKey()); RegistryUnit.T.getKey());
ImdgPredicateBuilder prdctBuilder = registryImdg.predicateBuilder(); ImdgPredicateBuilder prdctBuilder = registryImdg.predicateBuilder();
ImdgPredicate defaultCondition = prdctBuilder.sql(sqlCondition); ImdgPredicate defaultCondition = prdctBuilder.sql(sqlCondition);
if (sessionType != null) { if (sessionType != null && sessionType.equals(SessionType.XDEP)) {
//не всегда нужное условие //не всегда нужное условие
defaultCondition = prdctBuilder.and(defaultCondition, sessionTypePredicate()); defaultCondition = prdctBuilder.and(defaultCondition, sessionTypePredicate());
} }
@ -204,6 +204,11 @@ public class InclusionToPoolAction extends AbstractSessionActionForOkErrorHandli
rgsPb.equals("sessionType", SessionType.MEDM.getKey()), rgsPb.equals("sessionType", SessionType.MEDM.getKey()),
rgsPb.equals("sessionType", SessionType.XDEP.getKey()) rgsPb.equals("sessionType", SessionType.XDEP.getKey())
); );
} else if (SessionType.PAYM.equals(sessionType)) {
return rgsPb.or(
rgsPb.equals("sessionType", SessionType.PREP.getKey()),
rgsPb.equals("sessionType", SessionType.PAYM.getKey())
);
} else { } else {
return rgsPb.equals("sessionType", sessionType.getKey()); return rgsPb.equals("sessionType", sessionType.getKey());
} }