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

asset operation fields

Browse source
This commit is contained in:
ialbert 2023-09-11 16:49:40 +03:00
parent 14f6d5656b
commit 4226df3e5c
6 changed files with 20 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf06Executor.java
View file

@ -352,7 +352,7 @@ public class Sdf06Executor {
private AssetOperationRequest requestFromStatement(Statement stmt, String tradingCode, String tcrCode) { private AssetOperationRequest requestFromStatement(Statement stmt, String tradingCode, String tcrCode) {
AssetOperationRequest req = new AssetOperationRequest(); AssetOperationRequest req = new AssetOperationRequest();
req.setStatementId(stmt.getId()); req.setEntityId(stmt.getId());
req.setAmount(stmt.getAmount()); req.setAmount(stmt.getAmount());
req.setSecuritySymbol(CurrencyCode.RUB.getKey()); //fixme retrieve security symbol from validator req.setSecuritySymbol(CurrencyCode.RUB.getKey()); //fixme retrieve security symbol from validator
req.setTradingCode(tradingCode); req.setTradingCode(tradingCode);

2
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf10Executor.java
View file

@ -361,7 +361,7 @@ public class Sdf10Executor {
private AssetOperationRequest requestFromStatement(Statement stmt, String tradingCode, String tcrCode, String securityCode) { private AssetOperationRequest requestFromStatement(Statement stmt, String tradingCode, String tcrCode, String securityCode) {
AssetOperationRequest req = new AssetOperationRequest(); AssetOperationRequest req = new AssetOperationRequest();
req.setStatementId(stmt.getId()); req.setEntityId(stmt.getId());
// req.setAmount(stmt.getAmount()); // req.setAmount(stmt.getAmount());
req.setQuantity(stmt.getAmount()); req.setQuantity(stmt.getAmount());
req.setSecuritySymbol(securityCode); //fixme retrieve security symbol from validator req.setSecuritySymbol(securityCode); //fixme retrieve security symbol from validator

2
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf20Executor.java
View file

@ -178,7 +178,7 @@ public class Sdf20Executor {
String tcrCode//из TCR String tcrCode//из TCR
) { ) {
AssetOperationRequest req = new AssetOperationRequest(); AssetOperationRequest req = new AssetOperationRequest();
req.setStatementId(null); req.setEntityId(null);
req.setQuantity(quantity); //+ req.setQuantity(quantity); //+
req.setSecuritySymbol(securitySymbol); //+ req.setSecuritySymbol(securitySymbol); //+
req.setTradingCode(tradingCode); //??? req.setTradingCode(tradingCode); //???

2
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/integration/GatewayRequestCreator.java
View file

@ -7,7 +7,7 @@ import ru.spcex.platform.enumeration.CurrencyCode;
public class GatewayRequestCreator { public class GatewayRequestCreator {
public static AssetOperationRequest gatewayRequestPart(Statement stmt, String tradingCode, String tcrCode) { public static AssetOperationRequest gatewayRequestPart(Statement stmt, String tradingCode, String tcrCode) {
AssetOperationRequest req = new AssetOperationRequest(); AssetOperationRequest req = new AssetOperationRequest();
req.setStatementId(stmt.getId()); req.setEntityId(stmt.getId());
req.setAmount(stmt.getAmount()); req.setAmount(stmt.getAmount());
req.setSecuritySymbol(CurrencyCode.RUB.getKey()); //fixme retrieve security symbol from validator req.setSecuritySymbol(CurrencyCode.RUB.getKey()); //fixme retrieve security symbol from validator
req.setTradingCode(tradingCode); req.setTradingCode(tradingCode);

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

@ -201,7 +201,7 @@ public class GatewayService extends QueueConsumer implements InitializingBean {
} finally { } finally {
SentAsset sentAsset = new SentAsset(); SentAsset sentAsset = new SentAsset();
sentAsset.setId(outboundRequest.getId()); sentAsset.setId(outboundRequest.getId());
sentAsset.setStatementId(assetOperation.getStatementId()); sentAsset.setStatementId(assetOperation.getEntityId());
assets.add(sentAsset); assets.add(sentAsset);
} }
} }

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

@ -6,7 +6,9 @@ import java.math.BigDecimal;
public class AssetOperationRequest { public class AssetOperationRequest {
@JsonProperty @JsonProperty
private Long statementId; private Long sessionId;
@JsonProperty
private Long entityId;
@JsonProperty @JsonProperty
private BigDecimal amount; private BigDecimal amount;
@JsonProperty @JsonProperty
@ -20,12 +22,20 @@ public class AssetOperationRequest {
@JsonProperty @JsonProperty
private String direction; private String direction;
public Long getStatementId() { public Long getEntityId() {
return statementId; return entityId;
} }
public void setStatementId(Long statementId) { public void setEntityId(Long entityId) {
this.statementId = statementId; this.entityId = entityId;
}
public Long getSessionId() {
return sessionId;
}
public void setSessionId(Long sessionId) {
this.sessionId = sessionId;
} }
public BigDecimal getAmount() { public BigDecimal getAmount() {