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

asset operation fields [gateway]

Browse source
This commit is contained in:
etreshenkov 2023-09-11 17:04:27 +03:00
parent d95f22662d
commit 26f6c081f4
6 changed files with 14 additions and 14 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

@ -226,7 +226,7 @@ public class Sdf06Executor {
for (SingleAssetResponse gatewayMsg : req.getRequestPayload().getApprovals()) { for (SingleAssetResponse gatewayMsg : req.getRequestPayload().getApprovals()) {
//получаем запрос для текущей группы sdf06 //получаем запрос для текущей группы sdf06
//находим группу //находим группу
Long statementId = gatewayMsg.getStatementId(); Long statementId = gatewayMsg.getEntityId();
ImdgPredicateBuilder pb = statementImdg.predicateBuilder(); ImdgPredicateBuilder pb = statementImdg.predicateBuilder();
Statement stmt = statementImdg.getFirstObjectByPredicate( Statement stmt = statementImdg.getFirstObjectByPredicate(
pb.and( pb.and(

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

@ -245,7 +245,7 @@ public class Sdf10Executor {
for (SingleAssetResponse gatewayMsg : req.getRequestPayload().getApprovals()) { for (SingleAssetResponse gatewayMsg : req.getRequestPayload().getApprovals()) {
//получаем запрос для текущей группы sdf10 //получаем запрос для текущей группы sdf10
//находим группу //находим группу
Long statementId = gatewayMsg.getStatementId(); Long statementId = gatewayMsg.getEntityId();
ImdgPredicateBuilder pb = statementImdg.predicateBuilder(); ImdgPredicateBuilder pb = statementImdg.predicateBuilder();
Statement stmt = statementImdg.getFirstObjectByPredicate( Statement stmt = statementImdg.getFirstObjectByPredicate(
pb.and( pb.and(

10
clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/operations/SentAsset.java
View file

@ -5,7 +5,7 @@ import java.util.UUID;
public class SentAsset { public class SentAsset {
private boolean isReceivedResponse = false; private boolean isReceivedResponse = false;
private UUID id; private UUID id;
private Long statementId; private Long entityId;
private OperationsRequest operationsRequest; private OperationsRequest operationsRequest;
public boolean isReceivedResponse() { public boolean isReceivedResponse() {
@ -32,11 +32,11 @@ public class SentAsset {
this.operationsRequest = operationsRequest; this.operationsRequest = operationsRequest;
} }
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;
} }
} }

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.getEntityId()); sentAsset.setEntityId(assetOperation.getEntityId());
assets.add(sentAsset); assets.add(sentAsset);
} }
} }

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

@ -48,7 +48,7 @@ public class OperationService {
for (SentAsset sentAsset : assets) { for (SentAsset sentAsset : assets) {
SingleAssetResponse singleAssetResponse = new SingleAssetResponse(); SingleAssetResponse singleAssetResponse = new SingleAssetResponse();
singleAssetResponse.setApproved(sentAsset.getOperationsRequest().getResult()); singleAssetResponse.setApproved(sentAsset.getOperationsRequest().getResult());
singleAssetResponse.setStatementId(sentAsset.getStatementId()); singleAssetResponse.setEntityId(sentAsset.getEntityId());
responsesToClearing.add(singleAssetResponse); responsesToClearing.add(singleAssetResponse);
} }
AssetOperationApprovalRequest assetOperationApprovalRequest = new AssetOperationApprovalRequest(); AssetOperationApprovalRequest assetOperationApprovalRequest = new AssetOperationApprovalRequest();

10
platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/gateway/SingleAssetResponse.java
View file

@ -4,16 +4,16 @@ import com.fasterxml.jackson.annotation.JsonProperty;
public class SingleAssetResponse { public class SingleAssetResponse {
@JsonProperty @JsonProperty
private Long statementId; private Long entityId;
@JsonProperty @JsonProperty
private boolean approved; private boolean approved;
public Long getStatementId() { public Long getEntityId() {
return statementId; return entityId;
} }
public void setStatementId(Long statementId) { public void setEntityId(Long statementId) {
this.statementId = statementId; this.entityId = statementId;
} }
public boolean isApproved() { public boolean isApproved() {