From 53a5d25cd9fc3487982e4b776b02d14a7dce677e Mon Sep 17 00:00:00 2001
From: AKurakin <akurakin@mfd.ru>
Date: Tue, 4 Apr 2023 14:49:41 +0300
Subject: [PATCH] =?UTF-8?q?http://jira.mfd.msk:8088/browse/CLS-259=20?=
 =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20platform-enum,=20?=
 =?UTF-8?q?=D0=BF=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=20=D0=BF=D0=BE?=
 =?UTF-8?q?=D0=BB=D1=8F=20=D0=B2=20CompanyNewRequest?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/enumeration/CompanySymbol.java   |  3 ++-
 .../platform/enumeration/ServiceProduct.java  | 20 ++++++++++++++
 .../platform/messaging/domain/Consts.java     |  1 +
 .../domain/cud/company/CompanyNewRequest.java | 27 +++++++++++++++++--
 4 files changed, 48 insertions(+), 3 deletions(-)
 create mode 100644 platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/ServiceProduct.java

diff --git a/platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/CompanySymbol.java b/platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/CompanySymbol.java
index 33170c8d0..fe03542c9 100644
--- a/platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/CompanySymbol.java
+++ b/platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/CompanySymbol.java
@@ -3,7 +3,8 @@ package ru.spcex.platform.enumeration;
 import ru.spcex.platform.utils.enumeration.IEnumKey;
 
 public enum CompanySymbol implements IEnumKey {
-    INN("INN"), BIC("BIC");
+    INN("INN"), BIC("BIC"),
+    TRDC("TRDC"), CLRC("CLRC"), RGRC("RGRC");
 
     private final String key;
 
diff --git a/platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/ServiceProduct.java b/platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/ServiceProduct.java
new file mode 100644
index 000000000..7272851d8
--- /dev/null
+++ b/platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/ServiceProduct.java
@@ -0,0 +1,20 @@
+package ru.spcex.platform.enumeration;
+
+import ru.spcex.platform.utils.enumeration.IEnumKey;
+
+public enum ServiceProduct implements IEnumKey {
+    PRNT("PRNT"), // Расчет обязательств с процентом
+    ZERO("ZERO") // Расчет обязательств без процента (по умолчанию)
+    ;
+
+    private final String key;
+
+    ServiceProduct(String key) {
+        this.key = key;
+    }
+
+    @Override
+    public String getKey() {
+        return key;
+    }
+}
diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/Consts.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/Consts.java
index 44d11db48..377059b1d 100644
--- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/Consts.java
+++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/Consts.java
@@ -24,6 +24,7 @@ public interface Consts {
     String DESTINATION_COMPANY_NEW = "company-new";
     String DESTINATION_COMPANY_DELETE = "company-delete";
     String DESTINATION_COMPANY_UPDATE = "company-update";
+    String DESTINATION_COMPANY_BLOCK = "company-block";
     String DESTINATION_COMPANY_INFO_UPDATE = "company-info-update";
     String DESTINATION_COMPANY_SYMBOL_UPDATE = "company-symbol-update";
     String DESTINATION_CONTACT_UPDATE = "contact-update";
diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/company/CompanyNewRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/company/CompanyNewRequest.java
index fa0c2a46a..79685bd20 100644
--- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/company/CompanyNewRequest.java
+++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/company/CompanyNewRequest.java
@@ -7,6 +7,15 @@ public class CompanyNewRequest {
     private String shortName;
     @JsonProperty
     private String fullName;
+
+    @JsonProperty
+    private String companySymbol;
+    @JsonProperty
+    private String companySymbolValue;
+    @JsonProperty
+    private String workflowStatus;
+
+    //todo deprecated 3 field:
     @JsonProperty
     private String tradingCode;
     @JsonProperty
@@ -17,8 +26,6 @@ public class CompanyNewRequest {
     // for update, todo разобраться, это тот же тип запроса или надо отдельный на update сделать?
     @JsonProperty
     private Long id;
-    @JsonProperty
-    private String workflowStatus;
 
     public String getShortName() {
         return shortName;
@@ -60,6 +67,22 @@ public class CompanyNewRequest {
         this.registrationCode = registrationCode;
     }
 
+    public String getCompanySymbol() {
+        return companySymbol;
+    }
+
+    public void setCompanySymbol(String companySymbol) {
+        this.companySymbol = companySymbol;
+    }
+
+    public String getCompanySymbolValue() {
+        return companySymbolValue;
+    }
+
+    public void setCompanySymbolValue(String companySymbolValue) {
+        this.companySymbolValue = companySymbolValue;
+    }
+
     public Long getId() {
         return id;
     }