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 ddaf951a4..ad0c6afd2 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 @@ -31,7 +31,6 @@ import ru.spcex.platform.imdg.api.ImdgProvider; import ru.spcex.platform.utils.enumeration.EnumMessage; import ru.spcex.platform.utils.enumeration.IMessageResolver; import ru.spcex.platform.utils.number.BigDecimalUtil; -import ru.spcex.platform.utils.time.TimeUtil; import ru.spcex.platform.utils.validation.IValidator; import java.time.Instant; @@ -138,7 +137,7 @@ public class StatementService extends QueueConsumer implements InitializingBean statement.setErrorText(errorResolver.resolve(accountResult.getError())); } else { accountBalanceImdg.insert(accountResult.getAccount()); //insert == update? - statement.setStatus(OperationStatus.Executed.getKey()); + statement.setOperationStatus(OperationStatus.Executed.getKey()); } statementImdg.update(statement); @@ -157,15 +156,15 @@ public class StatementService extends QueueConsumer implements InitializingBean statement.setAddresseeId(company.getId()); statement.setSenderId(Sender.Prc.getId()); statement.setCreated(Instant.now()); - statement.setClearingDate(TimeUtil.today()); + statement.setClearingDate(LocalDate.now()); statement.setStatementType(StatementType.full.getKey()); statement.setAccountId(account.getId()); statement.setAccount(sdf01.getAccount()); statement.setInOutDirection(InOutDirection.in.getKey()); - statement.setSettlementDate(TimeUtil.localDateToInstant(LocalDate.parse(sdf01.getDat(), datFormatter))); + statement.setSettlementDate(LocalDate.parse(sdf01.getDat(), datFormatter)); statement.setAmount(BigDecimalUtil.parse(sdf01.getRemainder())); statement.setCashMovementCurrencyCode(CurrencyCode.RUB.getKey()); - statement.setStatus(OperationStatus.Pending.getKey()); + statement.setOperationStatus(OperationStatus.Pending.getKey()); statement.setInSDfId(sdf01.getId()); statement.setInOutSDfType(InOutSDfType.type1.getKey()); statementImdg.insert(statement); @@ -177,7 +176,7 @@ public class StatementService extends QueueConsumer implements InitializingBean statement.setAccountId(account.getId()); statement.setAccount(sdf01.getAccount()); statement.setInOutDirection(InOutDirection.in.getKey()); - statement.setSettlementDate(TimeUtil.localDateToInstant(LocalDate.parse(sdf01.getDat(), datFormatter))); + statement.setSettlementDate(LocalDate.parse(sdf01.getDat(), datFormatter)); statement.setAmount(BigDecimalUtil.parse(sdf01.getRemainder())); statement.setCashMovementCurrencyCode(CurrencyCode.RUB.getKey()); statementImdg.update(statement);