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

Merge branch 'dev' into CLS-198-new-meta-2.4

Browse source
This commit is contained in:
ialbert 2022-12-22 13:15:46 +03:00
commit edbe6b928b
4 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/service/Sdf16Executor.java
View file

@ -24,7 +24,6 @@ import ru.spcex.platform.utils.enumeration.EnumMessage;
import ru.spcex.platform.utils.enumeration.IMessageResolver; import ru.spcex.platform.utils.enumeration.IMessageResolver;
import ru.spcex.platform.utils.validation.IValidator; import ru.spcex.platform.utils.validation.IValidator;
import java.math.BigDecimal;
import java.time.Instant; import java.time.Instant;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
@ -201,15 +200,15 @@ public class Sdf16Executor extends AbstractExecutor<SDf16> {
successSdf.setGenerationId(generationIdForGroup); successSdf.setGenerationId(generationIdForGroup);
successSdf.setGenerationTime(Instant.now()); successSdf.setGenerationTime(Instant.now());
successSdf.setInSDf16Id(sdf.getId()); successSdf.setInSDf16Id(sdf.getId());
successSdf.setResult(BigDecimal.ZERO); successSdf.setResult(0);
return successSdf; return successSdf;
} }
private BigDecimal obtainResultNum(EnumMessage error){ private Integer obtainResultNum(EnumMessage error){
if (BalanceError.AccountNotPresent.equalsById(error.getSubject().getId())) if (BalanceError.AccountNotPresent.equalsById(error.getSubject().getId()))
return BigDecimal.ONE; return 1;
if (BalanceError.BalanceNotEnough.equalsById(error.getSubject().getId())) if (BalanceError.BalanceNotEnough.equalsById(error.getSubject().getId()))
return BigDecimal.ONE; return 1;
return BigDecimal.valueOf(9); return 9;
} }
} }

6
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf17.java
View file

@ -23,7 +23,7 @@ public class SDf17 extends SpcexObjectBase implements WithAccount {
private BigDecimal BIC; private BigDecimal BIC;
private String SPEC; private String SPEC;
private BigDecimal number; private BigDecimal number;
private BigDecimal result; private Integer result;
private Instant generationTime; private Instant generationTime;
private Long generationId; private Long generationId;
private Long inSDf16Id; private Long inSDf16Id;
@ -93,11 +93,11 @@ public class SDf17 extends SpcexObjectBase implements WithAccount {
this.number = value; this.number = value;
} }
public BigDecimal getResult() { public Integer getResult() {
return result; return result;
} }
public void setResult(BigDecimal value) { public void setResult(Integer value) {
this.result = value; this.result = value;
} }

4
clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF17_Converter.java
View file

@ -34,9 +34,9 @@ public class S_DF17_Converter extends DFConverter<SDf17> {
dbfFields.add(new DBFField("TYPE", DBFDataType.CHARACTER, 1)); dbfFields.add(new DBFField("TYPE", DBFDataType.CHARACTER, 1));
dbfFields.add(new DBFField("_I_N_N", DBFDataType.NUMERIC, 32, 18)); 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("_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("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); return dbfFields.toArray(DBFField[]::new);
} }

2
clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf17MapStore.java
View file

@ -47,7 +47,7 @@ public class SDf17MapStore extends TemplateMapStore<SDf17> {
object.setBIC(resultSet.getObject("_B_I_C", BigDecimal.class)); object.setBIC(resultSet.getObject("_B_I_C", BigDecimal.class));
object.setSPEC(resultSet.getObject("_S_P_E_C", String.class)); object.setSPEC(resultSet.getObject("_S_P_E_C", String.class));
object.setNumber(resultSet.getObject("NUMBER", BigDecimal.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.setGenerationTime(getInstantFromTimestamp(resultSet, "GENERATION_TIME"));
object.setGenerationId(resultSet.getObject("GENERATION_ID", Long.class)); object.setGenerationId(resultSet.getObject("GENERATION_ID", Long.class));
object.setInSDf16Id(resultSet.getObject("IN_S_DF16_ID", Long.class)); object.setInSDf16Id(resultSet.getObject("IN_S_DF16_ID", Long.class));