修改mt2mx的50-59域的account判断条件

swiftCore/src/main/java/com/brilliance/swift/mt2mx/pacs008001/impl/Pacs00801Parse52Field.java

@@ -43,6 +43,21 @@ public class Pacs00801Parse52Field extends AbstractMt2MxPacs008001ParseField {
             if (StringUtil.isNotEmpty(field52A.getComponent2())) {
                 account += "/" + field52A.getComponent2();
             }
+            if (StringUtil.isNotEmpty(account)) {
+                if (account.startsWith("//") && !account.startsWith("//CH") && !account.startsWith("//FW")) {
+                    Map<String, Object> finInstnIdMaps = MapUtil.getAndCreateNotPut(dbtrAgtMaps, "finInstnId");
+                    Map<String, Object> clrSysMmbIdMaps = MapUtil.getAndCreateNotPut(finInstnIdMaps, "clrSysMmbId");
+                    mt_to_mxClearingIdentifier(account, clrSysMmbIdMaps);
+                    if(clrSysMmbIdMaps.size()>0){
+                        finInstnIdMaps.put("clrSysMmbId", clrSysMmbIdMaps);
+                    }
+                    if(finInstnIdMaps.size()>0){
+                        dbtrAgtMaps.put("finInstnId", finInstnIdMaps);
+                    }
+                } else if (!account.startsWith("//") || account.startsWith("//CH")) {
+                    mt_to_mxFinancialInstitutionAccount(account, dbtrAgtAcctMaps, "DbtrAgtAcct/Id");
+                }
+            }
         } else if (field52D != null) {
             if (StringUtil.isNotEmpty(field52D.getComponent1())) {
                 account += "/" + field52D.getComponent1();
@@ -52,25 +67,25 @@ public class Pacs00801Parse52Field extends AbstractMt2MxPacs008001ParseField {
             }
             String nameAddress = field52D.getNameAndAddress();
             mt_to_mxFinancialInstitutionNameAndUnstructuredAddress(nameAddress, dbtrAgtMaps);
+            if (StringUtil.isNotEmpty(account)) {
+                if (account.startsWith("//") && !account.startsWith("//CH")) {
+                    Map<String, Object> finInstnIdMaps = MapUtil.getAndCreateNotPut(dbtrAgtMaps, "finInstnId");
+                    Map<String, Object> clrSysMmbIdMaps = MapUtil.getAndCreateNotPut(finInstnIdMaps, "clrSysMmbId");
+                    mt_to_mxClearingIdentifier(account, clrSysMmbIdMaps);
+                    if(clrSysMmbIdMaps.size()>0){
+                        finInstnIdMaps.put("clrSysMmbId", clrSysMmbIdMaps);
+                    }
+                    if(finInstnIdMaps.size()>0){
+                        dbtrAgtMaps.put("finInstnId", finInstnIdMaps);
+                    }
+                } else if (!account.startsWith("//") || account.startsWith("//CH")) {
+                    mt_to_mxFinancialInstitutionAccount(account, dbtrAgtAcctMaps, "DbtrAgtAcct/Id");
+                }
+            }
         } else {
             String sendBic = (String) context.get(Mt2MxContextIdentifier.MT_SEND_BIC, true);
             mt_to_mxBICFI(sendBic, dbtrAgtMaps);
         }
-        if (StringUtil.isNotEmpty(account)) {
-            if (account.startsWith("//") && !account.startsWith("//CH") && !account.startsWith("//FW")) {
-                Map<String, Object> finInstnIdMaps = MapUtil.getAndCreateNotPut(dbtrAgtMaps, "finInstnId");
-                Map<String, Object> clrSysMmbIdMaps = MapUtil.getAndCreateNotPut(finInstnIdMaps, "clrSysMmbId");
-                mt_to_mxClearingIdentifier(account, clrSysMmbIdMaps);
-                if(clrSysMmbIdMaps.size()>0){
-                    finInstnIdMaps.put("clrSysMmbId", clrSysMmbIdMaps);
-                }
-                if(finInstnIdMaps.size()>0){
-                    dbtrAgtMaps.put("finInstnId", finInstnIdMaps);
-                }
-            } else if (!account.startsWith("//") || account.startsWith("//CH")) {
-                mt_to_mxFinancialInstitutionAccount(account, dbtrAgtAcctMaps, "DbtrAgtAcct/Id");
-            }
-        }
         if (dbtrAgtMaps.size() > 0) {
             cdtTrfTxInfMaps.put("dbtrAgt", dbtrAgtMaps);
         }

swiftCore/src/main/java/com/brilliance/swift/mt2mx/pacs008001/impl/Pacs00801Parse56Field.java

@@ -74,7 +74,7 @@ public class Pacs00801Parse56Field extends AbstractMt2MxPacs008001ParseField {
                 clearingChannelRTGSFlag = true;
             }
             Map<String, Object> finInstnIdMaps = MapUtil.getAndCreateNotPut(intrmyAgt1Maps, "finInstnId");
-            if (account.startsWith("//") && !account.startsWith("//CH") && !account.startsWith("//FW")) {
+            if (account.startsWith("//") && !account.startsWith("//CH")) {
                 if (isMTClearingSystemCodeInList(account)) {
                     Map<String, Object> clrSysMmbIdMaps = MapUtil.getAndCreateNotPut(finInstnIdMaps, "clrSysMmbId");
                     mt_to_mxClearingIdentifier(account, clrSysMmbIdMaps);
@@ -108,7 +108,7 @@ public class Pacs00801Parse56Field extends AbstractMt2MxPacs008001ParseField {
             }
             String nameAddress = field56D.getNameAndAddress();
             mt_to_mxFinancialInstitutionNameAndUnstructuredAddress(nameAddress, intrmyAgt1Maps);
-            if (account.startsWith("//") && !account.startsWith("//CH") && !account.startsWith("//FW")) {
+            if (account.startsWith("//") && !account.startsWith("//CH")) {
                 Map<String, Object> finInstnIdMaps = MapUtil.getAndCreateNotPut(intrmyAgt1Maps, "finInstnId");
                 Map<String, Object> clrSysMmbIdMaps = MapUtil.getAndCreateNotPut(finInstnIdMaps, "clrSysMmbId");
                 mt_to_mxClearingIdentifier(account, clrSysMmbIdMaps);

swiftCore/src/main/java/com/brilliance/swift/mt2mx/pacs008001/impl/Pacs00801Parse57Field.java

@@ -86,7 +86,7 @@ public class Pacs00801Parse57Field extends AbstractMt2MxPacs008001ParseField {
             }
             String location = field57B.getLocation();
             Map<String, Object> finInstnIdMaps = MapUtil.getAndCreateNotPut(cdtrAgtMaps, "finInstnId");
-            if (account.startsWith("//") && !account.startsWith("//CH") && !account.startsWith("//FW")) {
+            if (account.startsWith("//") && !account.startsWith("//CH")) {
                 if (isMTClearingSystemCodeInList(account)) {
                     Map<String, Object> clrSysMmbIdMaps = MapUtil.getAndCreateNotPut(finInstnIdMaps, "clrSysMmbId");
                     mt_to_mxClearingIdentifier(account, clrSysMmbIdMaps);

swiftCore/src/main/java/com/brilliance/swift/mt2mx/pacs009001/impl/Pacs009001Parse56Field.java

@@ -73,7 +73,7 @@ public class Pacs009001Parse56Field extends AbstractMt2MxPacs009001ParseField {
             }
             String nameAddress = field56D.getNameAndAddress();
             mt_to_mxFinancialInstitutionNameAndUnstructuredAddress(nameAddress, intrmyAgt1Maps);
-            if (account.startsWith("//") && !account.startsWith("//CH") && !account.startsWith("//FW")) {
+            if (account.startsWith("//") && !account.startsWith("//CH")) {
                 Map<String, Object> finInstnIdMaps = MapUtil.getAndCreateNotPut(intrmyAgt1Maps, "finInstnId");
                 Map<String, Object> clrSysMmbIdMaps = MapUtil.getAndCreateNotPut(finInstnIdMaps, "clrSysMmbId");
                 mt_to_mxClearingIdentifier(account, clrSysMmbIdMaps);

swiftCore/src/main/java/com/brilliance/swift/mt2mx/pacs009001/impl/Pacs009001Parse57Field.java

@@ -79,7 +79,7 @@ public class Pacs009001Parse57Field extends AbstractMt2MxPacs009001ParseField {
             }
             String location = field57B.getLocation();
             Map<String, Object> finInstnIdMaps = MapUtil.getAndCreateNotPut(cdtrAgtMaps, "finInstnId");
-            if (account.startsWith("//") && !account.startsWith("//CH") && !account.startsWith("//FW")) {
+            if (account.startsWith("//") && !account.startsWith("//CH")) {
                 if (isMTClearingSystemCodeInList(account)) {
                     Map<String, Object> clrSysMmbIdMaps = MapUtil.getAndCreateNotPut(finInstnIdMaps, "clrSysMmbId");
                     mt_to_mxClearingIdentifier(account, clrSysMmbIdMaps);

swiftCore/src/main/java/com/brilliance/swift/mt2mx/pacs009001/impl/Pacs009001Parse58Field.java

@@ -71,7 +71,7 @@ public class Pacs009001Parse58Field extends AbstractMt2MxPacs009001ParseField {
             }
             String nameAddress = field58D.getNameAndAddress();
             mt_to_mxFinancialInstitutionNameAndUnstructuredAddress(nameAddress, cdtrMaps);
-            if (account.startsWith("//") && !account.startsWith("//CH") && !account.startsWith("//FW")) {
+            if (account.startsWith("//") && !account.startsWith("//CH")) {
                 Map<String, Object> finInstnIdMaps = MapUtil.getAndCreateNotPut(cdtrMaps, "finInstnId");
                 Map<String, Object> clrSysMmbIdMaps = MapUtil.getAndCreateNotPut(finInstnIdMaps, "clrSysMmbId");
                 mt_to_mxClearingIdentifier(account, clrSysMmbIdMaps);

swiftCore/src/main/java/com/brilliance/swift/mt2mx/pacs009001/impl/Pacs009001ParseSeqB56Field.java

@@ -103,7 +103,7 @@ public class Pacs009001ParseSeqB56Field extends AbstractMt2MxPacs009001ParseFiel
             }
             String nameAddress = field56D.getNameAndAddress();
             mt_to_mxFinancialInstitutionNameAndUnstructuredAddress(nameAddress, intrmyAgt1Maps);
-            if (account.startsWith("//") && !account.startsWith("//CH") && !account.startsWith("//FW")) {
+            if (account.startsWith("//") && !account.startsWith("//CH")) {
                 Map<String, Object> finInstnIdMaps = MapUtil.getAndCreateNotPut(intrmyAgt1Maps, "finInstnId");
                 Map<String, Object> clrSysMmbIdMaps = MapUtil.getAndCreateNotPut(finInstnIdMaps, "clrSysMmbId");
                 mt_to_mxClearingIdentifier(account, clrSysMmbIdMaps);

swiftCore/src/main/java/com/brilliance/swift/mt2mx/pacs009001/impl/Pacs009001ParseSeqB57Field.java

@@ -137,7 +137,7 @@ public class Pacs009001ParseSeqB57Field extends AbstractMt2MxPacs009001ParseFiel
             }
             String location = field57B.getLocation();
             Map<String, Object> finInstnIdMaps = MapUtil.getAndCreateNotPut(cdtrAgtMaps, "finInstnId");
-            if (account.startsWith("//") && !account.startsWith("//CH") && !account.startsWith("//FW")) {
+            if (account.startsWith("//") && !account.startsWith("//CH")) {
                 if (isMTClearingSystemCodeInList(account)) {
                     Map<String, Object> clrSysMmbIdMaps = MapUtil.getAndCreateNotPut(finInstnIdMaps, "clrSysMmbId");
                     mt_to_mxClearingIdentifier(account, clrSysMmbIdMaps);