diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/tkr/request/MoneyAccount.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/tkr/request/MoneyAccount.java index 343e67137..e0b916aa7 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/tkr/request/MoneyAccount.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/tkr/request/MoneyAccount.java @@ -7,6 +7,8 @@ public class MoneyAccount { private String currCode; @JsonProperty("account") private String account; + @JsonProperty("eks_account") + private String eksAccount; @JsonProperty("status") private String status; @@ -26,6 +28,14 @@ public class MoneyAccount { this.account = account; } + public String getEksAccount() { + return eksAccount; + } + + public void setEksAccount(String eksAccount) { + this.eksAccount = eksAccount; + } + public String getStatus() { return status; } diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/GatewayService.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/GatewayService.java index 4aab131da..9234f6239 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/GatewayService.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/GatewayService.java @@ -282,12 +282,13 @@ public class GatewayService extends QueueConsumer implements InitializingBean { if (reportRequest.getRequestId() != null) { outboundRequest.setId(reportRequest.getRequestId()); } - GatewayResultBuilder gatewayBuilder = GatewayResultBuilder.builder(); - gatewayBuilder.outboundRequest(outboundRequest); + GatewayResult gatewayResult = GatewayResultBuilder.builder() + .outboundRequest(outboundRequest) + .build(); + gatewayResultImdg.insert(gatewayResult); String url = formingInboundUrl(inboundServerSettings.getPathLOCM()); HttpEntity r = makeDefaultRequest(outboundRequest); ResponseEntity response = restTemplate.exchange(url, HttpMethod.POST, r, SuccessResponse.class); - gatewayResultImdg.insert(gatewayBuilder.build()); SuccessResponse bodyResponse = response.getBody(); if (bodyResponse != null) { log.debug("Response from service: {}", bodyResponse); diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/gateway/MoneyAccountMsgResponse.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/gateway/MoneyAccountMsgResponse.java index b00774f43..58f4f1661 100644 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/gateway/MoneyAccountMsgResponse.java +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/gateway/MoneyAccountMsgResponse.java @@ -7,6 +7,8 @@ public class MoneyAccountMsgResponse { private String currCode; @JsonProperty("account") private String account; + @JsonProperty("eks_account") + private String eksAccount; @JsonProperty("is_active") private Boolean isActive; @@ -26,6 +28,14 @@ public class MoneyAccountMsgResponse { this.account = account; } + public String getEksAccount() { + return eksAccount; + } + + public void setEksAccount(String eksAccount) { + this.eksAccount = eksAccount; + } + public Boolean getActive() { return isActive; }