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

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

Browse source
This commit is contained in:
ialbert 2026-04-28 10:16:27 +03:00
parent 96885fa9d6
commit 333603c937
4 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -120,7 +120,7 @@ public class PrecSessionStateMachineConfig extends EnumStateMachineConfigurerAda
); );
this.obligationAdmissionContinueAction.setDataEnum(DataEnum.obligationAdmissionStashedRgs); this.obligationAdmissionContinueAction.setDataEnum(DataEnum.obligationAdmissionStashedRgs);
this.inspectionObligationsV2Action.setClearingMemberCategoryFilter( this.inspectionObligationsV2Action.setClearingMemberCategoryFilter(
category -> !ClearingCategory.P.equalsByKey(category) category -> category == null || !ClearingCategory.P.equalsByKey(category)
); );
} }

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

@ -120,7 +120,7 @@ public class PrpcSessionStateMachineConfig extends EnumStateMachineConfigurerAda
); );
this.obligationAdmissionContinueAction.setDataEnum(DataEnum.obligationAdmissionStashedRgs); this.obligationAdmissionContinueAction.setDataEnum(DataEnum.obligationAdmissionStashedRgs);
this.inspectionObligationsV2Action.setClearingMemberCategoryFilter( this.inspectionObligationsV2Action.setClearingMemberCategoryFilter(
ClearingCategory.P::equalsByKey ctgr -> ctgr != null && ClearingCategory.P.equalsByKey(ctgr)
); );
} }

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

@ -53,7 +53,6 @@ import ru.spcex.platform.utils.enumeration.IMessageResolver;
import ru.spcex.platform.utils.enumeration.SimpleMessageResolver; import ru.spcex.platform.utils.enumeration.SimpleMessageResolver;
import ru.spcex.platform.utils.number.BigDecimalUtil; import ru.spcex.platform.utils.number.BigDecimalUtil;
import static ru.spcex.platform.utils.number.BigDecimalUtil.safeBD; import static ru.spcex.platform.utils.number.BigDecimalUtil.safeBD;
import ru.spcex.platform.utils.text.TextUtil;
import ru.spcex.platform.utils.time.TimeUtil; import ru.spcex.platform.utils.time.TimeUtil;
@Service @Service
@ -176,15 +175,9 @@ public class InspectionObligationsPrecAction extends ReviseStage1Action {
rgs.getCompanyId() rgs.getCompanyId()
).cashed(cmcImdg.predicateBuilder(), cmcCash); ).cashed(cmcImdg.predicateBuilder(), cmcCash);
ClearingMemberCategory cmc = cmcImdg.getSingleObjectByPredicate(cmcPrdct); ClearingMemberCategory cmc = cmcImdg.getSingleObjectByPredicate(cmcPrdct);
if (cmc == null || TextUtil.isEmpty(cmc.getClearingMemberCategory())) { if (!cmcFilter.apply(cmc != null ? cmc.getClearingMemberCategory() : null)) {
log.error("couldn't find ClearingMemberCategory for group.id={}, rgs.id={}, company.id={}",
entry.getKey().groupId(), rgs.getId(), rgs.getCompanyId());
setGroupStatusError.accept(group);
continue GROUP;
}
if (!cmcFilter.apply(cmc.getClearingMemberCategory())) {
log.debug("group.id={}, rgs.id={}, company.id={}: category {}, skipping", log.debug("group.id={}, rgs.id={}, company.id={}: category {}, skipping",
entry.getKey().groupId(), rgs.getId(), rgs.getCompanyId(),cmc.getClearingMemberCategory()); entry.getKey().groupId(), rgs.getId(), rgs.getCompanyId(), cmc != null ? cmc.getClearingMemberCategory() : "null");
continue; continue;
} }
ImdgPredicate am_bPrdct = AssetByTcrCompanyAccountCashedPredicate ImdgPredicate am_bPrdct = AssetByTcrCompanyAccountCashedPredicate

4
clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/error/DefaultManagementErrors.java
View file

@ -3,7 +3,9 @@ package ru.spcex.clearing.dflt.management.error;
import ru.spcex.platform.utils.enumeration.IErrorEnumId; import ru.spcex.platform.utils.enumeration.IErrorEnumId;
public enum DefaultManagementErrors implements IErrorEnumId { public enum DefaultManagementErrors implements IErrorEnumId {
//DictionaryNotFound(5003L),
//RecordNotFoundInDictionary(5423L),
//RecordNotFound(5406L),
GeneralError(11000L), GeneralError(11000L),
RecordNotFound(11001L), RecordNotFound(11001L),
RecordAlreadyPresent(11002L), RecordAlreadyPresent(11002L),