From c211870d3f7a2f41cec9da583570232b701eb18e Mon Sep 17 00:00:00 2001 From: AKurakin Date: Wed, 14 Jun 2023 17:37:52 +0300 Subject: [PATCH] =?UTF-8?q?clearing-service=20http://jira.mfd.msk:8088/bro?= =?UTF-8?q?wse/CLS-265=20Sdf08Executor=20=D0=BF=D0=BE=D0=BF=D1=80=D0=B0?= =?UTF-8?q?=D0=B2=D0=B8=D0=BB=20=D1=82=D0=B8=D0=BF=20=D1=81=D1=87=D1=91?= =?UTF-8?q?=D1=82=D0=B0-=D0=B4=D0=B5=D0=BF=D0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/executors/Sdf08Executor.java | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf08Executor.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf08Executor.java index 9e6482d39..ab0f3fd73 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf08Executor.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf08Executor.java @@ -183,11 +183,28 @@ public class Sdf08Executor extends AbstractExecutor { return Optional.empty(); } + /** + * + * @param sdf01Id + * @param account DepoCode + * @param companyId + * @return AccountSdfRequestPart + */ private AccountSdfRequestPart createAccountRequestPart(Long sdf01Id, String account, Long companyId) { AccountSdfRequestPart req = new AccountSdfRequestPart(); req.setAccount(account); req.setCompanyId(companyId); - req.setAccountType(AccountType.Clrn.getKey()); + String accountType = null; + if (account != null) { + int p = account.indexOf(":"); + if (p > 3) { // выбрать 3-ю букву, отсчитывая от последнего символа + accountType = account.substring(p - 3, p - 2); + } + } + if (accountType == null) { + log.warn("Unparseable depoCode of account: \"{}\"", account); + } + req.setAccountType(accountType); req.setSdfId(sdf01Id); return req; }