account-service backend-api http://jira.mfd.msk:8088/browse/CLS-667 meta bankAccount actions intermediarySwiftCode

clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/BankAccountService.java

@@ -138,6 +138,7 @@ public class BankAccountService extends QueueConsumer implements InitializingBea
             bankAccount.setCompanyId(req.getCompanyId());
             bankAccount.setAccountId(accountId);
             bankAccount.setSwiftCode(req.getSwiftCode());
+            bankAccount.setIntermediarySwiftCode(req.getIntermediarySwiftCode());
             bankAccountId = bankAccountMap.insert(bankAccount);
 
             txOk = true;
@@ -176,6 +177,7 @@ public class BankAccountService extends QueueConsumer implements InitializingBea
         bankAccount.setTaxRegistrationReasonCode(req.getTaxRegistrationReasonCode());
         bankAccount.setAccount(req.getAccount());
         bankAccount.setSwiftCode(req.getSwiftCode());
+        bankAccount.setIntermediarySwiftCode(req.getIntermediarySwiftCode());
 
         Account account = accountMap.getSingleObjectByID(bankAccount.getAccountId());
         account.setAccount(req.account);

clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/account/BankAccountNewAction.java

@@ -50,6 +50,9 @@ public class BankAccountNewAction implements IAction<BankAccountNewRequest> {
     @ApiModelProperty(value = "SWIFT", example = "ABCDE")
     @JsonProperty
     private String swiftCode;
+    @ApiModelProperty(value = "Код SWIFT посредника", example = "ABCDE")
+    @JsonProperty
+    private String intermediarySwiftCode;
 
     @Override
     public BankAccountNewRequest toRequest() {
@@ -65,6 +68,7 @@ public class BankAccountNewAction implements IAction<BankAccountNewRequest> {
         req.setAccount(this.account);
         req.setCompanyId(this.companyId);
         req.setSwiftCode(swiftCode);
+        req.setIntermediarySwiftCode(intermediarySwiftCode);
         return req;
     }
 
@@ -161,4 +165,12 @@ public class BankAccountNewAction implements IAction<BankAccountNewRequest> {
     public void setSwiftCode(String swiftCode) {
         this.swiftCode = swiftCode;
     }
+
+    public String getIntermediarySwiftCode() {
+        return intermediarySwiftCode;
+    }
+
+    public void setIntermediarySwiftCode(String intermediarySwiftCode) {
+        this.intermediarySwiftCode = intermediarySwiftCode;
+    }
 }

clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/account/BankAccountUpdateAction.java

@@ -41,6 +41,9 @@ public class BankAccountUpdateAction implements IAction<BankAccountUpdateRequest
     @ApiModelProperty(value = "SWIFT", example = "ABCDE")
     @JsonProperty
     private String swiftCode;
+    @ApiModelProperty(value = "Код SWIFT посредника", example = "ABCDE")
+    @JsonProperty
+    private String intermediarySwiftCode;
 
     @ApiModelProperty(value = "Номер счета", example = "11111222223333344444")
     private String account;
@@ -59,6 +62,7 @@ public class BankAccountUpdateAction implements IAction<BankAccountUpdateRequest
         req.setTaxRegistrationReasonCode(this.taxRegistrationReasonCode);
         req.setAccount(this.account);
         req.setSwiftCode(swiftCode);
+        req.setIntermediarySwiftCode(intermediarySwiftCode);
         return req;
     }
 
@@ -155,4 +159,12 @@ public class BankAccountUpdateAction implements IAction<BankAccountUpdateRequest
     public void setSwiftCode(String swiftCode) {
         this.swiftCode = swiftCode;
     }
+
+    public String getIntermediarySwiftCode() {
+        return intermediarySwiftCode;
+    }
+
+    public void setIntermediarySwiftCode(String intermediarySwiftCode) {
+        this.intermediarySwiftCode = intermediarySwiftCode;
+    }
 }

clearing-parent/backend-api/src/main/resources/meta/meta.json

@@ -1,6 +1,6 @@
 
 		{
-		"version": "3.12.0.91",
+		"version": "3.12.0.92",
 		
 		"enums": {
 		
@@ -5030,6 +5030,10 @@
 		{"code": "destination",
 			"type": 2,"length": 255,"name": "Назначение платежа","shortname": "Назначение платежа","visible": true
 		}
+	,
+		{"code": "intermediarySwiftCode",
+			"type": 2,"length": 255,"name": "Код SWIFT посредника","shortname": "SWIFT посредника","searchable": true,"sortable": true,"visible": true
+		}
 	]
 			}
 		,
@@ -5085,6 +5089,10 @@
 		{"code": "destination",
 			"type": 2,"length": 255,"name": "Назначение платежа","shortname": "Назначение платежа","visible": true
 		}
+	,
+		{"code": "intermediarySwiftCode",
+			"type": 2,"length": 255,"name": "Код SWIFT посредника","shortname": "SWIFT посредника","searchable": true,"sortable": true,"visible": true
+		}
 	]
 			}
 		,

clearing-parent/backend-api/src/main/resources/meta/meta.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--?xml-stylesheet type="text/xsl" href="\..\corp-reports\src\data\meta\meta.server.xslt"?-->
-<meta version="3.12.0.91">
+<meta version="3.12.0.92">
 	<!-- _xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" _xsi:noNamespaceSchemaLocation="file:///E:/d/projects/meta/from/meta.xsd" -->
 	<!--Здесь словари-->
 	<enums>
@@ -1169,6 +1169,7 @@
 					<account type="2" length="50" name="Номер счета" shortname="Счет" required="true"/>
 					<companyId type="1" name="Компания" shortname="Компания" link="company" linkCode="shortName" visible="false"/>
 					<destination type="2" length="255" name="Назначение платежа" shortname="Назначение платежа" visible="true"/>
+					<intermediarySwiftCode type="2" length="255" name="Код SWIFT посредника" shortname="SWIFT посредника" searchable="true" sortable="true" visible="true"/>
 				</post>
 				<put name="Изменение счета вывода средств" confirmation="currency,bankIdentificationCode,bankName,correspondentAccount,correspondentAccountName,taxpayerIdentificationNumber,taxRegistrationReasonCode,account" class="ru.spcex.clearing.backendapi.controller.request.cud.account.BankAccountUpdateAction">
 					<id type="1" name="Идентификатор записи" shortname="ID" link="bankAccount" linkCode="id" required="true"/>
@@ -1182,6 +1183,7 @@
 					<taxRegistrationReasonCode type="2" length="255" name="Код причины постановки (КПП)" shortname="КПП"/>
 					<account type="2" length="50" name="Номер счета" shortname="Счет"/>
 					<destination type="2" length="255" name="Назначение платежа" shortname="Назначение платежа" visible="true"/>
+					<intermediarySwiftCode type="2" length="255" name="Код SWIFT посредника" shortname="SWIFT посредника" searchable="true" sortable="true" visible="true"/>
 				</put>
 				<delete name="Блокировка счета вывода средств" confirmation="currency,bankIdentificationCode,correspondentAccount,taxpayerIdentificationNumber,taxRegistrationReasonCode,account" class="ru.spcex.clearing.backendapi.controller.request.cud.common.CommonDeleteAction">
 					<id type="1" name="Идентификатор записи" shortname="ID" link="bankAccount" linkCode="id" required="true"/>

clearing-parent/backend-api/src/test/resources/meta.json

@@ -1,6 +1,6 @@
 
 		{
-		"version": "3.12.0.91",
+		"version": "3.12.0.92",
 		
 		"enums": {
 		
@@ -5030,6 +5030,10 @@
 		{"code": "destination",
 			"type": 2,"length": 255,"name": "Назначение платежа","shortname": "Назначение платежа","visible": true
 		}
+	,
+		{"code": "intermediarySwiftCode",
+			"type": 2,"length": 255,"name": "Код SWIFT посредника","shortname": "SWIFT посредника","searchable": true,"sortable": true,"visible": true
+		}
 	]
 			}
 		,
@@ -5085,6 +5089,10 @@
 		{"code": "destination",
 			"type": 2,"length": 255,"name": "Назначение платежа","shortname": "Назначение платежа","visible": true
 		}
+	,
+		{"code": "intermediarySwiftCode",
+			"type": 2,"length": 255,"name": "Код SWIFT посредника","shortname": "SWIFT посредника","searchable": true,"sortable": true,"visible": true
+		}
 	]
 			}
 		,

platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/account/BankAccountNewRequest.java

@@ -27,6 +27,8 @@ public class BankAccountNewRequest {
     public Long companyId;
     @JsonProperty
     public String swiftCode;
+    @JsonProperty
+    private String intermediarySwiftCode;
 
     public String getBankIdentificationCode() {
         return bankIdentificationCode;
@@ -123,4 +125,12 @@ public class BankAccountNewRequest {
     public void setSwiftCode(String swiftCode) {
         this.swiftCode = swiftCode;
     }
+
+    public String getIntermediarySwiftCode() {
+        return intermediarySwiftCode;
+    }
+
+    public void setIntermediarySwiftCode(String intermediarySwiftCode) {
+        this.intermediarySwiftCode = intermediarySwiftCode;
+    }
 }

platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/account/BankAccountUpdateRequest.java

@@ -25,6 +25,8 @@ public class BankAccountUpdateRequest {
     public String account;//Номер счета
     @JsonProperty
     public String swiftCode;
+    @JsonProperty
+    private String intermediarySwiftCode;
 
     public Long getId() {
         return id;
@@ -113,4 +115,12 @@ public class BankAccountUpdateRequest {
     public void setSwiftCode(String swiftCode) {
         this.swiftCode = swiftCode;
     }
+
+    public String getIntermediarySwiftCode() {
+        return intermediarySwiftCode;
+    }
+
+    public void setIntermediarySwiftCode(String intermediarySwiftCode) {
+        this.intermediarySwiftCode = intermediarySwiftCode;
+    }
 }