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

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

Browse source
This commit is contained in:
akulikov 2023-12-28 17:46:09 +03:00
parent be58666afc
commit 2cbb8a39ef
2 changed files with 25 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSCommissionTradesReportBuilder.java
View file

@ -151,6 +151,7 @@ public class KSCommissionTradesReportBuilder extends CSVReportBuilder<EmptyParam
String agreementNumberPostfix = registry.getContract(); String agreementNumberPostfix = registry.getContract();
String classCode = MarketCode.XMNSKFLO.getKey();
pb = executionDepositImdg.predicateBuilder(); pb = executionDepositImdg.predicateBuilder();
Collection<ExecutionDeposit> executionDeposits = executionDepositImdg.getCollectionObjectsByPredicate( Collection<ExecutionDeposit> executionDeposits = executionDepositImdg.getCollectionObjectsByPredicate(
pb.and( pb.and(
@ -158,12 +159,11 @@ public class KSCommissionTradesReportBuilder extends CSVReportBuilder<EmptyParam
pb.notNull("market") pb.notNull("market")
) )
); );
if (executionDeposits.isEmpty()) { if (!executionDeposits.isEmpty()) {
log.warn("Not found ExecutionDeposit for registry (id = {}), groupId: {}. Registry skipped", registry.getId(), registry.getGroupId()); if (executionDeposits.size() > 1) log.warn("ExecutionDeposit[exchangeExecutionId = {}].size > 1, use first", registry.getGroupId());
continue; ExecutionDeposit executionDeposit = executionDeposits.iterator().next();
classCode = executionDeposit.getMarket();
} }
if (executionDeposits.size() > 1) log.warn("ExecutionDeposit[exchangeExecutionId = {}].size > 1, use first", registry.getGroupId());
ExecutionDeposit executionDeposit = executionDeposits.iterator().next();
String account = null; String account = null;
AccountType accountType = IEnumKey.getEnumByKey(AccountType.class, registry.getAccountType()); AccountType accountType = IEnumKey.getEnumByKey(AccountType.class, registry.getAccountType());
@ -217,7 +217,7 @@ public class KSCommissionTradesReportBuilder extends CSVReportBuilder<EmptyParam
if (secCode != null && secCode.contains("/")) if (secCode != null && secCode.contains("/"))
secCode = secCode.substring(0, secCode.indexOf("/")); secCode = secCode.substring(0, secCode.indexOf("/"));
ksCommissionTradesReport.setSecCode(secCode); ksCommissionTradesReport.setSecCode(secCode);
ksCommissionTradesReport.setClassCode(executionDeposit.getMarket()); ksCommissionTradesReport.setClassCode(classCode);
ksCommissionTradesReport.setAgreementNumber(agreementNumber); ksCommissionTradesReport.setAgreementNumber(agreementNumber);
ksCommissionTradesReport.setAgreementNumberPostfix(agreementNumberPostfix); ksCommissionTradesReport.setAgreementNumberPostfix(agreementNumberPostfix);
ksCommissionTradesReport.setAgreementDate(registry.getTradingDate()); ksCommissionTradesReport.setAgreementDate(registry.getTradingDate());

19
platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/MarketCode.java Normal file
View file

@ -0,0 +1,19 @@
package ru.spcex.platform.enumeration;
import ru.spcex.platform.utils.enumeration.IEnumKey;
public enum MarketCode implements IEnumKey {
XMNSKFLO("XMNSKFLO"),
;
private final String key;
MarketCode(String key) {
this.key = key;
}
@Override
public String getKey() {
return key;
}
}