diff --git a/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/service/Sdf16Executor.java b/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/service/Sdf16Executor.java index a91db0fb6..62bb4b64d 100644 --- a/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/service/Sdf16Executor.java +++ b/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/service/Sdf16Executor.java @@ -24,7 +24,6 @@ import ru.spcex.platform.utils.enumeration.EnumMessage; import ru.spcex.platform.utils.enumeration.IMessageResolver; import ru.spcex.platform.utils.validation.IValidator; -import java.math.BigDecimal; import java.time.Instant; import java.time.LocalDate; import java.time.format.DateTimeFormatter; @@ -201,15 +200,15 @@ public class Sdf16Executor extends AbstractExecutor { successSdf.setGenerationId(generationIdForGroup); successSdf.setGenerationTime(Instant.now()); successSdf.setInSDf16Id(sdf.getId()); - successSdf.setResult(BigDecimal.ZERO); + successSdf.setResult(0); return successSdf; } - private BigDecimal obtainResultNum(EnumMessage error){ + private Integer obtainResultNum(EnumMessage error){ if (BalanceError.AccountNotPresent.equalsById(error.getSubject().getId())) - return BigDecimal.ONE; + return 1; if (BalanceError.BalanceNotEnough.equalsById(error.getSubject().getId())) - return BigDecimal.ONE; - return BigDecimal.valueOf(9); + return 1; + return 9; } } diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf17.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf17.java index cc19fb3f5..fd3ee5f18 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf17.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf17.java @@ -23,7 +23,7 @@ public class SDf17 extends SpcexObjectBase implements WithAccount { private BigDecimal BIC; private String SPEC; private BigDecimal number; - private BigDecimal result; + private Integer result; private Instant generationTime; private Long generationId; private Long inSDf16Id; @@ -93,11 +93,11 @@ public class SDf17 extends SpcexObjectBase implements WithAccount { this.number = value; } - public BigDecimal getResult() { + public Integer getResult() { return result; } - public void setResult(BigDecimal value) { + public void setResult(Integer value) { this.result = value; } diff --git a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF17_Converter.java b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF17_Converter.java index 206f8d84a..5a43a2255 100644 --- a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF17_Converter.java +++ b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF17_Converter.java @@ -34,9 +34,9 @@ public class S_DF17_Converter extends DFConverter { dbfFields.add(new DBFField("TYPE", DBFDataType.CHARACTER, 1)); dbfFields.add(new DBFField("_I_N_N", DBFDataType.NUMERIC, 32, 18)); dbfFields.add(new DBFField("_B_I_C", DBFDataType.NUMERIC, 32, 18)); - dbfFields.add(new DBFField("_S_P_E_C", DBFDataType.NUMERIC, 32, 18)); + dbfFields.add(new DBFField("_S_P_E_C", DBFDataType.CHARACTER, 254)); dbfFields.add(new DBFField("NUMBER", DBFDataType.NUMERIC, 32, 18)); - dbfFields.add(new DBFField("RESULT", DBFDataType.CHARACTER, 3)); + dbfFields.add(new DBFField("RESULT", DBFDataType.NUMERIC, 1)); return dbfFields.toArray(DBFField[]::new); } diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf17MapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf17MapStore.java index ad1f57bea..8f3b60e9a 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf17MapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf17MapStore.java @@ -47,7 +47,7 @@ public class SDf17MapStore extends TemplateMapStore { object.setBIC(resultSet.getObject("_B_I_C", BigDecimal.class)); object.setSPEC(resultSet.getObject("_S_P_E_C", String.class)); object.setNumber(resultSet.getObject("NUMBER", BigDecimal.class)); - object.setResult(resultSet.getObject("RESULT", BigDecimal.class)); + object.setResult(resultSet.getObject("RESULT", Integer.class)); object.setGenerationTime(getInstantFromTimestamp(resultSet, "GENERATION_TIME")); object.setGenerationId(resultSet.getObject("GENERATION_ID", Long.class)); object.setInSDf16Id(resultSet.getObject("IN_S_DF16_ID", Long.class));