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

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

Browse source
This commit is contained in:
etreschenkov 2023-06-16 19:49:50 +03:00
parent 98964a3f3e
commit 0865c8b1d7
3 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/GatewayService.java
View file

@ -144,14 +144,15 @@ public class GatewayService extends QueueConsumer implements InitializingBean {
AssetOperationRequest assetOperationRequest = request.getRequestPayload(); AssetOperationRequest assetOperationRequest = request.getRequestPayload();
Map<String, Object> content = Map.of("direction", "IN", Map<String, Object> content = Map.of("direction", "IN",
"amount", assetOperationRequest.getAmount(),
"code", assetOperationRequest.getCode(), "code", assetOperationRequest.getCode(),
"asset", assetOperationRequest.getSecuritySymbol(), "asset", assetOperationRequest.getSecuritySymbol(),
"firm_id", assetOperationRequest.getTradingCode()); "firm_id", assetOperationRequest.getTradingCode());
if (assetOperationRequest.getAmount() != null) { // if (assetOperationRequest.getAmount() != null) {
content.put("amount", assetOperationRequest.getAmount()); // content.put("amount", assetOperationRequest.getAmount());
} else { // } else {
content.put("quantity", assetOperationRequest.getQuantity()); // content.put("quantity", assetOperationRequest.getQuantity());
} // }
OutboundRequest outboundRequest = OutboundRequestBuilder.builder() OutboundRequest outboundRequest = OutboundRequestBuilder.builder()
.section(Section.MKR.getKey()) .section(Section.MKR.getKey())

2
clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/builders/OutboundRequestBuilder.java
View file

@ -40,7 +40,7 @@ public class OutboundRequestBuilder {
outboundRequest.setId(UUID.randomUUID()); outboundRequest.setId(UUID.randomUUID());
outboundRequest.setDatetime(Instant.now()); outboundRequest.setDatetime(Instant.now());
outboundRequest.setSection(section); outboundRequest.setSection(section);
outboundRequest.setType(requestType.getKey()); outboundRequest.setType(requestType != null ? requestType.getKey() : null);
outboundRequest.setContent(content); outboundRequest.setContent(content);
return outboundRequest; return outboundRequest;
} }

9
platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/clearing/AssetOperationRequest.java
View file

@ -1,13 +1,22 @@
package ru.spcex.clearing.platform.messaging.domain.cud.clearing; package ru.spcex.clearing.platform.messaging.domain.cud.clearing;
import com.fasterxml.jackson.annotation.JsonProperty;
import java.math.BigDecimal; import java.math.BigDecimal;
public class AssetOperationRequest { public class AssetOperationRequest {
@JsonProperty
private BigDecimal amount; private BigDecimal amount;
@JsonProperty
private BigDecimal quantity; private BigDecimal quantity;
@JsonProperty
private String securitySymbol; private String securitySymbol;
@JsonProperty
private String code; private String code;
@JsonProperty
private String tradingCode; private String tradingCode;
@JsonProperty
private String direction;
public BigDecimal getAmount() { public BigDecimal getAmount() {
return amount; return amount;