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

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
ialbert 2025-08-07 13:00:57 +03:00
commit 25937f5093
3 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/builder/PaymentInstructionBuilderV2.java
View file

@ -170,6 +170,7 @@ public class PaymentInstructionBuilderV2 {
payment.setSettlementDate(LocalDate.now());
}
log.debug("CS_BLKD={}", useCS_BLKD);
if (useCS_BLKD && checkAgent()) {
payment.setPaymentPurpose(SpecifFlag.CS_BLKD.getKey() + "_" + sessionId + " " + purpose);
} else {
@ -263,14 +264,27 @@ public class PaymentInstructionBuilderV2 {
break;
}
}
log.debug("{}.id={} checkAgent = {}",
am_b.getRegistryCode(),
am_b.getId(),
hasCounterPartyInitiator);
return hasCounterPartyInitiator;
}
public boolean categoryIOrVInitiator(Long companyId) {
ClearingMemberCategory category = clearingCategoryImdg.getFirstObjectByFieldValues(
Collection<ClearingMemberCategory> categories = clearingCategoryImdg.getCollectionObjectsByFieldValues(
Map.of("companyId", companyId));
ClearingCategory ctg = IEnumKey.getEnumByKey(ClearingCategory.class, category.getClearingMemberCategory());
return ctg != null && (ctg.equals(ClearingCategory.V) || ctg.equals(ClearingCategory.I)) ;
boolean result = false;
for (ClearingMemberCategory category : categories) {
log.debug("Found category.clearingMemberCategory: {} by companyId: {}",
category.getClearingMemberCategory(),
companyId);
ClearingCategory ctg = IEnumKey.getEnumByKey(ClearingCategory.class, category.getClearingMemberCategory());
result = result | ctg != null && (ctg.equals(ClearingCategory.V) || ctg.equals(ClearingCategory.I));
}
return result;
}
public boolean companyRoleODEPPresent(Long companyId) {

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

@ -205,6 +205,10 @@ public class FormingPaymentInstructionAssetsAction extends AbstractSessionAction
adjustByReturns);
}
amount = safeBD(registry.getBalance()).add(adjustByReturns);
log.debug("{}.id={} amount = {}",
registry.getRegistryCode(),
registry.getId(),
amount);
boolean isPositiveBalance = amount.compareTo(BigDecimal.ZERO) > 0;
if (amount.compareTo(BigDecimal.ZERO) == 0) {
continue;

4
clearing-parent/db-scripts/src/main/resources/db/DICTIONARIES.sql
View file

@ -548,6 +548,8 @@ INSERT INTO SESSION_STATUS_DICTIONARY(ID, CODE, NAME) values (14, 'CL10', 'Ид
INSERT INTO SESSION_STATUS_DICTIONARY(ID, CODE, NAME) values (15, 'С0_1', 'Идет клиринг: Установка начального баланса в сессии') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO SESSION_STATUS_DICTIONARY(ID, CODE, NAME) values (16, 'C5_0', 'Идет клиринг: Расчеты') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO SESSION_TYPE_DICTIONARY(ID, CODE, NAME) values (1, 'FINL', 'Итоговая клиринговая сессия') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO SESSION_TYPE_DICTIONARY(ID, CODE, NAME) values (2, 'MEDM', 'Промежуточная клиринговая сессия') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
@ -1056,4 +1058,4 @@ INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (10001, 'TRDI', 'Сде
/* Business objects */
INSERT INTO DB_VERSION(ID, DICTIONARY_VERSION) values (1, '3.19.0.100') ON CONFLICT (ID) DO UPDATE SET DICTIONARY_VERSION = EXCLUDED.DICTIONARY_VERSION
INSERT INTO DB_VERSION(ID, DICTIONARY_VERSION) values (1, '3.19.0.101') ON CONFLICT (ID) DO UPDATE SET DICTIONARY_VERSION = EXCLUDED.DICTIONARY_VERSION