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

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

Browse source
This commit is contained in:
etreschenkov 2025-10-27 18:28:50 +03:00
parent 53ac7d0a0c
commit c960291849
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/MultiCompanyService.java
View file

@ -193,13 +193,18 @@ public class MultiCompanyService
} }
for (ClearingMemberCategoryNewRequest partRequest : req.getCategories()) { for (ClearingMemberCategoryNewRequest partRequest : req.getCategories()) {
boolean isCategoryForDeletion = Arrays.asList("CLOS", "SSPD").contains(partRequest.getWorkflowStatus());
ClearingMemberCategory existCategory = findCategory(partRequest); ClearingMemberCategory existCategory = findCategory(partRequest);
if (isCategoryForDeletion && existCategory == null) {
log.debug("There is no category for deletion; do nothing...");
continue;
}
if (existCategory == null) { if (existCategory == null) {
log.trace("For company[{}] do new category", companyId); log.trace("For company[{}] do new category", companyId);
replyI = clearingMemberCategoryService.clearingMemberCategoryNew(wrapRequest(baseRequest, partRequest, ActionType.NEW)); replyI = clearingMemberCategoryService.clearingMemberCategoryNew(wrapRequest(baseRequest, partRequest, ActionType.NEW));
validateReply(companyId, "contactNew", replyI); validateReply(companyId, "contactNew", replyI);
} else { } else {
if (Arrays.asList("CLOS", "SSPD").contains(partRequest.getWorkflowStatus())) { if (isCategoryForDeletion) {
log.trace("For company[{}] do delete category[{}]", companyId, existCategory.getId()); log.trace("For company[{}] do delete category[{}]", companyId, existCategory.getId());
CommonDeleteRequest commonDeleteRequest = createDeleteRequest(existCategory); CommonDeleteRequest commonDeleteRequest = createDeleteRequest(existCategory);
clearingMemberCategoryService.clearingMemberCategoryDelete(wrapRequest(baseRequest, commonDeleteRequest, ActionType.DELETE)); clearingMemberCategoryService.clearingMemberCategoryDelete(wrapRequest(baseRequest, commonDeleteRequest, ActionType.DELETE));