diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/builder/Sdf03Builder.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/builder/Sdf03Builder.java index f5fc3b642..3be7d7de9 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/builder/Sdf03Builder.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/builder/Sdf03Builder.java @@ -10,8 +10,10 @@ import ru.spcex.platform.utils.time.TimeUtil; import java.time.Instant; import java.time.LocalDate; +import java.time.format.DateTimeFormatter; public class Sdf03Builder { + protected static final DateTimeFormatter PROPERTY_DATE_FORMATTER_YY = DateTimeFormatter.ofPattern("dd.MM.yy"); private final Imdg companyImdg; public Sdf03Builder(Imdg companyImdg) { @@ -70,7 +72,7 @@ public class Sdf03Builder { } LocalDate paymtDt = TimeUtil.toLocalDate(paymentInstruction.getPaymentDate()); if (paymtDt != null) { - sDf03.setPay_date(paymtDt.format(TimeUtil.PROPERTY_DATE_FORMATTER)); + sDf03.setPay_date(paymtDt.format(PROPERTY_DATE_FORMATTER_YY)); } sDf03.setPay_val("RUR"); sDf03.setSum_deb(paymentInstruction.getDebitLegAmount() != null ? paymentInstruction.getDebitLegAmount().toString() : null); diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/builder/Sdf11Builder.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/builder/Sdf11Builder.java index 0f6ad19b1..59e5beaff 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/builder/Sdf11Builder.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/builder/Sdf11Builder.java @@ -11,6 +11,8 @@ import ru.spcex.platform.utils.time.TimeUtil; import java.time.Instant; import java.time.LocalDate; +import static ru.spcex.clearing.service.builder.Sdf03Builder.PROPERTY_DATE_FORMATTER_YY; + public class Sdf11Builder { private final Imdg companyImdg; @@ -67,7 +69,7 @@ public class Sdf11Builder { } LocalDate paymtDt = TimeUtil.toLocalDate(paymentInstruction.getPaymentDate()); if (paymtDt != null) { - sDf11.setPay_date(paymtDt.format(TimeUtil.PROPERTY_DATE_FORMATTER)); + sDf11.setPay_date(paymtDt.format(PROPERTY_DATE_FORMATTER_YY)); } sDf11.setPay_val("RUR"); sDf11.setSum_deb(paymentInstruction.getDebitLegAmount() != null ? paymentInstruction.getDebitLegAmount().toString() : null); diff --git a/clearing-parent/clearing-service/src/test/java/ru/spcex/clearing/service/builder/Sdf03BuilderTest.java b/clearing-parent/clearing-service/src/test/java/ru/spcex/clearing/service/builder/Sdf03BuilderTest.java new file mode 100644 index 000000000..bf30284e8 --- /dev/null +++ b/clearing-parent/clearing-service/src/test/java/ru/spcex/clearing/service/builder/Sdf03BuilderTest.java @@ -0,0 +1,17 @@ +package ru.spcex.clearing.service.builder; + +import org.junit.jupiter.api.Test; +import ru.spcex.platform.utils.time.TimeUtil; + +import java.time.LocalDate; + +import static org.junit.jupiter.api.Assertions.*; + +class Sdf03BuilderTest { + + @Test + void buildSdf03() { + LocalDate paymtDt = LocalDate.of(2023, 1, 20); + assertEquals("20.01.23", paymtDt.format(Sdf03Builder.PROPERTY_DATE_FORMATTER_YY)); + } +} \ No newline at end of file