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

clearing-service http://jira.mfd.msk:8088/browse/CLS-265 Sdf08Executor поправил определеление depo type

Browse source
This commit is contained in:
AKurakin 2023-06-28 14:21:43 +03:00
parent 2155c02a75
commit e9661f8ec6
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf08Executor.java
View file

@ -187,6 +187,9 @@ public class Sdf08Executor extends AbstractExecutor<SDf08> {
String accountType = null; String accountType = null;
if (depoCode != null) { if (depoCode != null) {
int p = depoCode.indexOf(":"); int p = depoCode.indexOf(":");
if (p == -1) { // двоеточие распарсили заранее при импорте файла, пример: 758200000AT0:000000000:SOVKB-BV-01:NW:0:РНКБ Банк(ПАО)
p = depoCode.length();
}
if (p > 3) { // выбрать 3-ю букву, отсчитывая от последнего символа if (p > 3) { // выбрать 3-ю букву, отсчитывая от последнего символа
accountType = depoCode.substring(p - 3, p - 2); accountType = depoCode.substring(p - 3, p - 2);
} }

5
clearing-parent/clearing-service/src/test/java/ru/spcex/clearing/service/executors/Sdf08ExecutorTest.java
View file

@ -16,8 +16,11 @@ class Sdf08ExecutorTest {
assertNull(sdf08Executor.parseAccountType(null)); assertNull(sdf08Executor.parseAccountType(null));
assertNull(sdf08Executor.parseAccountType(".")); assertNull(sdf08Executor.parseAccountType("."));
assertNull(sdf08Executor.parseAccountType("AAA222")); assertEquals("2", sdf08Executor.parseAccountType("AAA222"));
assertNull(sdf08Executor.parseAccountType("AA:A222")); assertNull(sdf08Executor.parseAccountType("AA:A222"));
assertEquals("B", sdf08Executor.parseAccountType("AAB12:A222")); assertEquals("B", sdf08Executor.parseAccountType("AAB12:A222"));
assertEquals("A", sdf08Executor.parseAccountType("758200000AT0:000000000:SOVKB-BV-01:NW:0:РНКБ Банк(ПАО)"));
assertEquals("A", sdf08Executor.parseAccountType("758200000AT0"));
} }
} }