diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/order/OrderCompanyNewAction.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/order/OrderCompanyNewAction.java index d8ae0dc9c..cffdc8905 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/order/OrderCompanyNewAction.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/order/OrderCompanyNewAction.java @@ -9,7 +9,7 @@ import ru.spcex.clearing.platform.messaging.domain.cud.order.OrderCompanyNewRequ public class OrderCompanyNewAction implements IAction { @ApiModelProperty(value = "Идентификатор записи", example = "12") @JsonProperty - private Long id; + private Long orderId; @ApiModelProperty(value = "Тип сделок переноса компании", example = "ASDF") @JsonProperty private Long companyId; @@ -23,7 +23,7 @@ public class OrderCompanyNewAction implements IAction { @Override public OrderCompanyNewRequest toRequest() { OrderCompanyNewRequest request = new OrderCompanyNewRequest(); - request.setId(id); + request.setOrderId(orderId); request.setCompanyId(companyId); request.setTradingClearingRegistryId(tradingClearingRegistryId); request.setQuantityLot(quantityLot); @@ -36,12 +36,12 @@ public class OrderCompanyNewAction implements IAction { return ActionType.NEW; } - public Long getId() { - return id; + public Long getOrderId() { + return orderId; } - public void setId(Long id) { - this.id = id; + public void setOrderId(Long orderId) { + this.orderId = orderId; } public Long getCompanyId() { diff --git a/clearing-parent/backend-api/src/main/resources/meta/meta.json b/clearing-parent/backend-api/src/main/resources/meta/meta.json index ca7b4849e..1087eec0d 100644 --- a/clearing-parent/backend-api/src/main/resources/meta/meta.json +++ b/clearing-parent/backend-api/src/main/resources/meta/meta.json @@ -1,6 +1,6 @@ { - "version": "3.23.295.152", + "version": "3.23.295.153", "enums": { @@ -11751,7 +11751,7 @@ "class": "ru.spcex.clearing.backendapi.controller.request.cud.order.OrderCompanyNewAction", "fields": [ - {"code": "id", + {"code": "orderId", "type": 1,"name": "Идентификатор записи","shortname": "ID начальной записи","link": "orderCurrency","linkCode": "id","required": true,"visible": false } , diff --git a/clearing-parent/backend-api/src/main/resources/meta/meta.xml b/clearing-parent/backend-api/src/main/resources/meta/meta.xml index b08a2733a..2f2b747a6 100644 --- a/clearing-parent/backend-api/src/main/resources/meta/meta.xml +++ b/clearing-parent/backend-api/src/main/resources/meta/meta.xml @@ -1,6 +1,6 @@ - + @@ -2726,7 +2726,7 @@ - + diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/order/OrderCompanyNewRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/order/OrderCompanyNewRequest.java index a4e28018e..99e1c09f8 100644 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/order/OrderCompanyNewRequest.java +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/order/OrderCompanyNewRequest.java @@ -5,7 +5,7 @@ import ru.spcex.platform.classes.base.interfaces.WithId; public class OrderCompanyNewRequest implements WithId { @JsonProperty - private Long id; + private Long orderId; @JsonProperty private Long companyId; @JsonProperty @@ -13,12 +13,12 @@ public class OrderCompanyNewRequest implements WithId { @JsonProperty private Long quantityLot; - public Long getId() { - return id; + public Long getOrderId() { + return orderId; } - public void setId(Long id) { - this.id = id; + public void setOrderId(Long orderId) { + this.orderId = orderId; } public Long getCompanyId() {