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

http://jira.mfd.msk:8088/browse/CLS-34

Browse source
This commit is contained in:
ialbert 2022-10-05 11:11:30 +03:00
parent ae3cc78586
commit 871332dc53
4 changed files with 39 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/service/StatementService.java
View file

@ -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.QueueConsumer;
import ru.spcex.clearing.platform.messaging.service.sender.KafkaSender; import ru.spcex.clearing.platform.messaging.service.sender.KafkaSender;
import ru.spcex.platform.classes.base.SpcexObjectBase; import ru.spcex.platform.classes.base.SpcexObjectBase;
import ru.spcex.platform.enumeration.CurrencyCode; import ru.spcex.platform.enumeration.*;
import ru.spcex.platform.enumeration.InOutSDfType;
import ru.spcex.platform.enumeration.OperationStatus;
import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.Imdg;
import ru.spcex.platform.imdg.api.ImdgProvider; import ru.spcex.platform.imdg.api.ImdgProvider;
import ru.spcex.platform.utils.enumeration.EnumMessage; import ru.spcex.platform.utils.enumeration.EnumMessage;
@ -148,10 +146,10 @@ public class StatementService extends QueueConsumer implements InitializingBean
statement.setSenderId(2L);// fixme справочник statement.setSenderId(2L);// fixme справочник
statement.setCreated(Instant.now()); statement.setCreated(Instant.now());
statement.setClearingDate(TimeUtil.today()); statement.setClearingDate(TimeUtil.today());
statement.setStatementTypeId(0L); //fixme справочник statement.setStatementType(StatementType.full.getKey()); //fixme справочник
statement.setAccountId(account.getId()); statement.setAccountId(account.getId());
statement.setAccount(0L); //fixme statement.setAccount(sdf01.getAccount()); //fixme
statement.setInOutDirection(0L); //fixme statement.setInOutDirection(InOutDirection.in.getKey()); //fixme
statement.setSettlementDate(TimeUtil.localDateToInstant(LocalDate.parse(sdf01.getDat(), datFormatter))); statement.setSettlementDate(TimeUtil.localDateToInstant(LocalDate.parse(sdf01.getDat(), datFormatter)));
statement.setAmount(null); //fixme sdf01.getRemainder() statement.setAmount(null); //fixme sdf01.getRemainder()
statement.setCashMovementCurrencyCode(CurrencyCode.RUB.getKey()); 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) { private void updateFlow(Statement statement, SDf01 sdf01, Account account) {
statement.setUpdated(Instant.now()); statement.setUpdated(Instant.now());
statement.setStatementTypeId(0L); //fixme справочник
statement.setAccountId(account.getId()); statement.setAccountId(account.getId());
statement.setAccount(0L); //fixme statement.setAccount(sdf01.getAccount()); //fixme
statement.setInOutDirection(0L); //fixme statement.setInOutDirection(InOutDirection.in.getKey()); //fixme
statement.setSettlementDate(TimeUtil.localDateToInstant(LocalDate.parse(sdf01.getDat(), datFormatter))); statement.setSettlementDate(TimeUtil.localDateToInstant(LocalDate.parse(sdf01.getDat(), datFormatter)));
statement.setAmount(null); //fixme sdf01.getRemainder() statement.setAmount(null); //fixme sdf01.getRemainder()
statement.setCashMovementCurrencyCode(CurrencyCode.RUB.getKey()); statement.setCashMovementCurrencyCode(CurrencyCode.RUB.getKey());

22
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/statement/Statement.java
View file

@ -17,11 +17,11 @@ public class Statement extends BusinessObject {
private Long addresseeId; private Long addresseeId;
private Long senderId; private Long senderId;
private Instant clearingDate; private Instant clearingDate;
private Long statementTypeId; private String statementType;
private String comment; private String comment;
private Long accountId; private Long accountId;
private Long account; private String account;
private Long inOutDirection; private String inOutDirection;
private Instant settlementDate; private Instant settlementDate;
private BigDecimal amount; private BigDecimal amount;
private String cashMovementCurrencyCode; private String cashMovementCurrencyCode;
@ -56,12 +56,12 @@ public class Statement extends BusinessObject {
this.clearingDate = value; this.clearingDate = value;
} }
public Long getStatementTypeId() { public String getStatementType() {
return statementTypeId; return statementType;
} }
public void setStatementTypeId(Long value) { public void setStatementType(String value) {
this.statementTypeId = value; this.statementType = value;
} }
public String getComment() { public String getComment() {
@ -80,19 +80,19 @@ public class Statement extends BusinessObject {
this.accountId = value; this.accountId = value;
} }
public Long getAccount() { public String getAccount() {
return account; return account;
} }
public void setAccount(Long value) { public void setAccount(String value) {
this.account = value; this.account = value;
} }
public Long getInOutDirection() { public String getInOutDirection() {
return inOutDirection; return inOutDirection;
} }
public void setInOutDirection(Long value) { public void setInOutDirection(String value) {
this.inOutDirection = value; this.inOutDirection = value;
} }

8
clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/StatementMapStore.java
View file

@ -44,11 +44,11 @@ public class StatementMapStore extends TemplateMapStore<Statement> {
object.setCreated(getInstantFromTimestamp(resultSet, "CREATED_AT")); object.setCreated(getInstantFromTimestamp(resultSet, "CREATED_AT"));
object.setUpdated(getInstantFromTimestamp(resultSet, "UPDATED_AT")); object.setUpdated(getInstantFromTimestamp(resultSet, "UPDATED_AT"));
object.setClearingDate(getInstantFromTimestamp(resultSet, "CLEARING_DATE")); 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.setComment(resultSet.getObject("COMMENT", String.class));
object.setAccountId(resultSet.getObject("ACCOUNT_ID", Long.class)); object.setAccountId(resultSet.getObject("ACCOUNT_ID", Long.class));
object.setAccount(resultSet.getObject("ACCOUNT", Long.class)); object.setAccount(resultSet.getObject("ACCOUNT", String.class));
object.setInOutDirection(resultSet.getObject("IN_OUT_DIRECTION", Long.class)); object.setInOutDirection(resultSet.getObject("IN_OUT_DIRECTION", String.class));
object.setSettlementDate(getInstantFromTimestamp(resultSet, "SETTLEMENT_DATE")); object.setSettlementDate(getInstantFromTimestamp(resultSet, "SETTLEMENT_DATE"));
object.setAmount(resultSet.getObject("AMOUNT", BigDecimal.class)); object.setAmount(resultSet.getObject("AMOUNT", BigDecimal.class));
object.setCashMovementCurrencyCode(resultSet.getObject("CASH_MOVEMENT_CURRENCY_CODE", String.class)); object.setCashMovementCurrencyCode(resultSet.getObject("CASH_MOVEMENT_CURRENCY_CODE", String.class));
@ -70,7 +70,7 @@ public class StatementMapStore extends TemplateMapStore<Statement> {
TimeUtil.toDateFromInstant(object.getCreated()), TimeUtil.toDateFromInstant(object.getCreated()),
TimeUtil.toDateFromInstant(object.getUpdated()), TimeUtil.toDateFromInstant(object.getUpdated()),
TimeUtil.toDateFromInstant(object.getClearingDate()), TimeUtil.toDateFromInstant(object.getClearingDate()),
object.getStatementTypeId(), object.getStatementType(),
object.getComment(), object.getComment(),
object.getAccountId(), object.getAccountId(),
object.getAccount(), object.getAccount(),

18
platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/InOutDirection.java Normal file
View file

@ -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;
}
}