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 d431fe1d8..f74df3fed 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 @@ -144,14 +144,15 @@ public class GatewayService extends QueueConsumer implements InitializingBean { AssetOperationRequest assetOperationRequest = request.getRequestPayload(); Map content = Map.of("direction", "IN", + "amount", assetOperationRequest.getAmount(), "code", assetOperationRequest.getCode(), "asset", assetOperationRequest.getSecuritySymbol(), "firm_id", assetOperationRequest.getTradingCode()); - if (assetOperationRequest.getAmount() != null) { - content.put("amount", assetOperationRequest.getAmount()); - } else { - content.put("quantity", assetOperationRequest.getQuantity()); - } +// if (assetOperationRequest.getAmount() != null) { +// content.put("amount", assetOperationRequest.getAmount()); +// } else { +// content.put("quantity", assetOperationRequest.getQuantity()); +// } OutboundRequest outboundRequest = OutboundRequestBuilder.builder() .section(Section.MKR.getKey()) diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/builders/OutboundRequestBuilder.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/builders/OutboundRequestBuilder.java index 533416775..1672e2051 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/builders/OutboundRequestBuilder.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/builders/OutboundRequestBuilder.java @@ -40,7 +40,7 @@ public class OutboundRequestBuilder { outboundRequest.setId(UUID.randomUUID()); outboundRequest.setDatetime(Instant.now()); outboundRequest.setSection(section); - outboundRequest.setType(requestType.getKey()); + outboundRequest.setType(requestType != null ? requestType.getKey() : null); outboundRequest.setContent(content); return outboundRequest; } diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/clearing/AssetOperationRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/clearing/AssetOperationRequest.java index d2d7a9c25..cedd62cb1 100644 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/clearing/AssetOperationRequest.java +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/clearing/AssetOperationRequest.java @@ -1,13 +1,22 @@ package ru.spcex.clearing.platform.messaging.domain.cud.clearing; +import com.fasterxml.jackson.annotation.JsonProperty; + import java.math.BigDecimal; public class AssetOperationRequest { + @JsonProperty private BigDecimal amount; + @JsonProperty private BigDecimal quantity; + @JsonProperty private String securitySymbol; + @JsonProperty private String code; + @JsonProperty private String tradingCode; + @JsonProperty + private String direction; public BigDecimal getAmount() { return amount;