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

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

Browse source
This commit is contained in:
ialbert 2022-10-07 10:32:40 +03:00
parent a0f0ebae39
commit 863bc27267
8 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/account/AccountBackendGetAll.java
View file

@ -45,7 +45,7 @@ public class AccountBackendGetAll extends BasicSpcexResponse {
singleItem.setAccount(account.getAccount());
singleItem.setAccountType(account.getAccountType());
singleItem.setRelationId(account.getRelationId());
singleItem.setStatus(account.getStatus());
singleItem.setStatus(account.getAccountStatus());
singleItem.setProcessingSign(account.getProcessingSign());
singleItem.setCreated(account.getCreated());
singleItem.setUpdated(account.getUpdated());

2
clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/validation/AccountBalanceValidationRule.java
View file

@ -39,7 +39,7 @@ public enum AccountBalanceValidationRule implements IValidationRule<ImdgValidati
if (account == null) {
return of(BalanceError.AccountNotPresent);
}
if (!Status.Active.equalsByKey(account.getStatus())) {
if (!Status.Active.equalsByKey(account.getAccountStatus())) {
return of(BalanceError.AccountNotActive, account.getId());
}
context.storeObject(ValidationStored.Account, account);

10
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/Account.java
View file

@ -14,7 +14,7 @@ public class Account extends BusinessObject {
private String account;
private String accountType;
private Long relationId;
private String status;
private String accountStatus;
private String processingSign;
public String getAccount() {
@ -41,12 +41,12 @@ public class Account extends BusinessObject {
this.relationId = value;
}
public String getStatus() {
return status;
public String getAccountStatus() {
return accountStatus;
}
public void setStatus(String value) {
this.status = value;
public void setAccountStatus(String value) {
this.accountStatus = value;
}
public String getProcessingSign() {

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

@ -25,7 +25,7 @@ public class Statement extends BusinessObject {
private Instant settlementDate;
private BigDecimal amount;
private String cashMovementCurrencyCode;
private String status;
private String operationStatus;
private String errorCode;
private String errorText;
private Long inSDfId;
@ -120,12 +120,12 @@ public class Statement extends BusinessObject {
this.cashMovementCurrencyCode = value;
}
public String getStatus() {
return status;
public String getOperationStatus() {
return operationStatus;
}
public void setStatus(String value) {
this.status = value;
public void setOperationStatus(String value) {
this.operationStatus = value;
}
public String getErrorCode() {

2
clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/AccountHistoryMapStore.java
View file

@ -46,7 +46,7 @@ public class AccountHistoryMapStore extends TemplateEventMapStore<AccountHistory
object.getAccount(),
object.getAccountType(),
object.getRelationId(),
object.getStatus(),
object.getAccountStatus(),
object.getProcessingSign()
};
return args;

4
clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/AccountMapStore.java
View file

@ -43,7 +43,7 @@ public class AccountMapStore extends TemplateMapStore<Account> {
object.setAccount(resultSet.getObject("ACCOUNT", String.class));
object.setAccountType(resultSet.getObject("ACCOUNT_TYPE", String.class));
object.setRelationId(resultSet.getObject("RELATION_ID", Long.class));
object.setStatus(resultSet.getObject("STATUS", String.class));
object.setAccountStatus(resultSet.getObject("STATUS", String.class));
object.setProcessingSign(resultSet.getObject("PROCESSING_SIGN", String.class));
return object;
}
@ -57,7 +57,7 @@ public class AccountMapStore extends TemplateMapStore<Account> {
object.getAccount(),
object.getAccountType(),
object.getRelationId(),
object.getStatus(),
object.getAccountStatus(),
object.getProcessingSign()
};
return args;

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

@ -52,7 +52,7 @@ public class StatementMapStore extends TemplateMapStore<Statement> {
object.setSettlementDate(getInstantFromTimestamp(resultSet, "SETTLEMENT_DATE"));
object.setAmount(resultSet.getObject("AMOUNT", BigDecimal.class));
object.setCashMovementCurrencyCode(resultSet.getObject("CASH_MOVEMENT_CURRENCY_CODE", String.class));
object.setStatus(resultSet.getObject("STATUS", String.class));
object.setOperationStatus(resultSet.getObject("STATUS", String.class));
object.setErrorCode(resultSet.getObject("ERROR_CODE", String.class));
object.setErrorText(resultSet.getObject("ERROR_TEXT", String.class));
object.setInSDfId(resultSet.getObject("IN_S_DF_ID", Long.class));
@ -78,7 +78,7 @@ public class StatementMapStore extends TemplateMapStore<Statement> {
TimeUtil.toDateFromInstant(object.getSettlementDate()),
object.getAmount(),
object.getCashMovementCurrencyCode(),
object.getStatus(),
object.getOperationStatus(),
object.getErrorCode(),
object.getErrorText(),
object.getInSDfId(),

4
clearing-parent/securities-service/src/main/resources/application.properties
View file

@ -5,9 +5,9 @@ securities-service.hazelcast.login=dev
securities-service.hazelcast.password=dev-pass
securities-service.kafka.bootstrap-servers=localhost:9092
securities-service.kafka.group-id=dev-group
securities-service.kafka.group-id=dev-group-moneyMarketSecurity
securities-service.kafka.enable-auto-commit=false
securities-service.kafka.session-timeout-ms=30000
securities-service.kafka.session-timeout-ms=300000
securities-service.kafka.auto-offset-reset=latest
securities-service.kafka.linger-ms=1
securities-service.kafka.buffer-memory=33554432