diff --git a/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/service/StatementService.java b/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/service/StatementService.java index d4799947c..a9d54f0f1 100644 --- a/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/service/StatementService.java +++ b/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/service/StatementService.java @@ -24,9 +24,7 @@ import ru.spcex.clearing.platform.messaging.domain.cud.balance.StatementRequest; import ru.spcex.clearing.platform.messaging.service.QueueConsumer; import ru.spcex.clearing.platform.messaging.service.sender.KafkaSender; import ru.spcex.platform.classes.base.SpcexObjectBase; -import ru.spcex.platform.enumeration.CurrencyCode; -import ru.spcex.platform.enumeration.InOutSDfType; -import ru.spcex.platform.enumeration.OperationStatus; +import ru.spcex.platform.enumeration.*; import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.ImdgProvider; import ru.spcex.platform.utils.enumeration.EnumMessage; @@ -148,10 +146,10 @@ public class StatementService extends QueueConsumer implements InitializingBean statement.setSenderId(2L);// fixme справочник statement.setCreated(Instant.now()); statement.setClearingDate(TimeUtil.today()); - statement.setStatementTypeId(0L); //fixme справочник + statement.setStatementType(StatementType.full.getKey()); //fixme справочник statement.setAccountId(account.getId()); - statement.setAccount(0L); //fixme - statement.setInOutDirection(0L); //fixme + statement.setAccount(sdf01.getAccount()); //fixme + statement.setInOutDirection(InOutDirection.in.getKey()); //fixme statement.setSettlementDate(TimeUtil.localDateToInstant(LocalDate.parse(sdf01.getDat(), datFormatter))); statement.setAmount(null); //fixme sdf01.getRemainder() statement.setCashMovementCurrencyCode(CurrencyCode.RUB.getKey()); @@ -164,10 +162,9 @@ public class StatementService extends QueueConsumer implements InitializingBean private void updateFlow(Statement statement, SDf01 sdf01, Account account) { statement.setUpdated(Instant.now()); - statement.setStatementTypeId(0L); //fixme справочник statement.setAccountId(account.getId()); - statement.setAccount(0L); //fixme - statement.setInOutDirection(0L); //fixme + statement.setAccount(sdf01.getAccount()); //fixme + statement.setInOutDirection(InOutDirection.in.getKey()); //fixme statement.setSettlementDate(TimeUtil.localDateToInstant(LocalDate.parse(sdf01.getDat(), datFormatter))); statement.setAmount(null); //fixme sdf01.getRemainder() statement.setCashMovementCurrencyCode(CurrencyCode.RUB.getKey()); diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/statement/Statement.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/statement/Statement.java index 92a9019cf..2dee323e7 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/statement/Statement.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/statement/Statement.java @@ -17,11 +17,11 @@ public class Statement extends BusinessObject { private Long addresseeId; private Long senderId; private Instant clearingDate; - private Long statementTypeId; + private String statementType; private String comment; private Long accountId; - private Long account; - private Long inOutDirection; + private String account; + private String inOutDirection; private Instant settlementDate; private BigDecimal amount; private String cashMovementCurrencyCode; @@ -56,12 +56,12 @@ public class Statement extends BusinessObject { this.clearingDate = value; } - public Long getStatementTypeId() { - return statementTypeId; + public String getStatementType() { + return statementType; } - public void setStatementTypeId(Long value) { - this.statementTypeId = value; + public void setStatementType(String value) { + this.statementType = value; } public String getComment() { @@ -80,19 +80,19 @@ public class Statement extends BusinessObject { this.accountId = value; } - public Long getAccount() { + public String getAccount() { return account; } - public void setAccount(Long value) { + public void setAccount(String value) { this.account = value; } - public Long getInOutDirection() { + public String getInOutDirection() { return inOutDirection; } - public void setInOutDirection(Long value) { + public void setInOutDirection(String value) { this.inOutDirection = value; } diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/StatementMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/StatementMapStore.java index 4213448be..3cc48d44b 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/StatementMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/StatementMapStore.java @@ -44,11 +44,11 @@ public class StatementMapStore extends TemplateMapStore { object.setCreated(getInstantFromTimestamp(resultSet, "CREATED_AT")); object.setUpdated(getInstantFromTimestamp(resultSet, "UPDATED_AT")); object.setClearingDate(getInstantFromTimestamp(resultSet, "CLEARING_DATE")); - object.setStatementTypeId(resultSet.getObject("STATEMENT_TYPE_ID", Long.class)); + object.setStatementType(resultSet.getObject("STATEMENT_TYPE_ID", String.class)); object.setComment(resultSet.getObject("COMMENT", String.class)); object.setAccountId(resultSet.getObject("ACCOUNT_ID", Long.class)); - object.setAccount(resultSet.getObject("ACCOUNT", Long.class)); - object.setInOutDirection(resultSet.getObject("IN_OUT_DIRECTION", Long.class)); + object.setAccount(resultSet.getObject("ACCOUNT", String.class)); + object.setInOutDirection(resultSet.getObject("IN_OUT_DIRECTION", String.class)); object.setSettlementDate(getInstantFromTimestamp(resultSet, "SETTLEMENT_DATE")); object.setAmount(resultSet.getObject("AMOUNT", BigDecimal.class)); object.setCashMovementCurrencyCode(resultSet.getObject("CASH_MOVEMENT_CURRENCY_CODE", String.class)); @@ -70,7 +70,7 @@ public class StatementMapStore extends TemplateMapStore { TimeUtil.toDateFromInstant(object.getCreated()), TimeUtil.toDateFromInstant(object.getUpdated()), TimeUtil.toDateFromInstant(object.getClearingDate()), - object.getStatementTypeId(), + object.getStatementType(), object.getComment(), object.getAccountId(), object.getAccount(), diff --git a/platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/InOutDirection.java b/platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/InOutDirection.java new file mode 100644 index 000000000..ec91a9dbf --- /dev/null +++ b/platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/InOutDirection.java @@ -0,0 +1,18 @@ +package ru.spcex.platform.enumeration; + +import ru.spcex.platform.utils.enumeration.IEnumKey; + +public enum InOutDirection implements IEnumKey { + in("IN"); + + private final String key; + + InOutDirection(String key) { + this.key = key; + } + + @Override + public String getKey() { + return key; + } +}