940和950mx,mx和swift之间的转换基本完成

046bbaac · zhanghou · e5c256e3 · 046bbaac · 046bbaac · 046bbaac
Commit 046bbaac authored May 05, 2022 by zhanghou
32 changed files
--- a/swiftCore/src/main/java/com/brilliance/swift/mt2SwiftDto/camt053001/impl/Camt053001Parse61Field.java
+++ b/swiftCore/src/main/java/com/brilliance/swift/mt2SwiftDto/camt053001/impl/Camt053001Parse61Field.java
@@ -7,7 +7,6 @@ import com.brilliance.swift.vo.BankToCustomerStatement;
 import com.brilliance.swift.vo.common.statementBreakdown;
 import com.prowidesoftware.swift.model.Tag;
 import com.prowidesoftware.swift.model.field.Field61;
-import com.prowidesoftware.swift.model.field.Field86;
 import com.prowidesoftware.swift.model.mt.AbstractMT;
 import com.prowidesoftware.swift.model.mt9xx.MT940;
 import com.prowidesoftware.swift.model.mt9xx.MT950;
@@ -61,7 +60,7 @@ public class Camt053001Parse61Field extends AbstractMt2SwiftDtoParseFields {
                        if(!Message86List.get(i).equals("no")){
                            statementBreakdown.setAddtlNtryInf(Message86List.get(i));
                        }
-                        bankToCustomerStatement.addNtryDto(statementBreakdown);
+                        bankToCustomerStatement.addStatementLine(statementBreakdown);
                    }
                }
            }else {
@@ -87,7 +86,7 @@ public class Camt053001Parse61Field extends AbstractMt2SwiftDtoParseFields {
                        statementBreakdown.setEndToEndId(field61List.get(i).getReferenceForTheAccountOwner());
                        statementBreakdown.setAcctSvcrRef(field61List.get(i).getReferenceOfTheAccountServicingInstitution());
                        statementBreakdown.setAddtlTxInf(field61List.get(i).getSupplementaryDetails());
-                        bankToCustomerStatement.addNtryDto(statementBreakdown);
+                        bankToCustomerStatement.addStatementLine(statementBreakdown);
                    }
                }
            }

--- a/swiftCore/src/main/java/com/brilliance/swift/mt2SwiftDto/camt053001/impl/Camt053001Parse65Field.java
+++ b/swiftCore/src/main/java/com/brilliance/swift/mt2SwiftDto/camt053001/impl/Camt053001Parse65Field.java
@@ -38,7 +38,7 @@ public class Camt053001Parse65Field extends AbstractMt2SwiftDtoParseFields {
                        balDto.setDate(DateUtil.parseDate("20"+field65List.get(i).getDate(), "yyyyMMdd"));
                        balDto.setCcy(field65List.get(i).getCurrency());
                        balDto.setAmt(field65List.get(i).amount());
-                        bankToCustomerStatement.addBalDtoSixFive(balDto);
+                        bankToCustomerStatement.addForwardAvailableBalance(balDto);
                    }
                }
            }

--- a/swiftCore/src/main/java/com/brilliance/swift/mx2swiftdto/Mx2SwiftDtoCreatorManager.java
+++ b/swiftCore/src/main/java/com/brilliance/swift/mx2swiftdto/Mx2SwiftDtoCreatorManager.java
@@ -2,6 +2,7 @@ package com.brilliance.swift.mx2swiftdto;
 import com.brilliance.swift.exception.SwiftException;
 import com.brilliance.swift.mx2swiftdto.bankcdbcdnf.Mx2SwiftDtoBTCDCNCreator;
+import com.brilliance.swift.mx2swiftdto.bankcusta.Mx2SwiftDtoBTCSCreator;
 import com.brilliance.swift.mx2swiftdto.custcdttsf.Mx2SwiftDtoCCTCreator;
 import com.brilliance.swift.mx2swiftdto.fininstcdttsf.Mx2SwiftDtoFICTCreator;
 import com.brilliance.swift.vo.SwiftDto;
@@ -61,6 +62,8 @@ public class Mx2SwiftDtoCreatorManager {
            return new Mx2SwiftDtoFICTCreator();
        }else if("camt054001".equals(msgType)){
            return new Mx2SwiftDtoBTCDCNCreator();
+        } else if("camt053001".equals(msgType)){
+            return new Mx2SwiftDtoBTCSCreator();
        } else {
            throw new SwiftException("Invalid message type");
        }

--- a/swiftCore/src/main/java/com/brilliance/swift/mx2swiftdto/bankcdbcdnf/Mx2SwiftDtoBTCDCNCreator.java
+++ b/swiftCore/src/main/java/com/brilliance/swift/mx2swiftdto/bankcdbcdnf/Mx2SwiftDtoBTCDCNCreator.java
@@ -138,51 +138,52 @@ public class Mx2SwiftDtoBTCDCNCreator extends AbstractMx2SwiftDtoCreator {
                        partyDto1.addAddress(adrLine);
                    }
                }
-                if(id2!=null||iban!=null){
+                if(id2!=null||iban2!=null){
                    PartyAccount partyAccount1 = new PartyAccount();
                    partyAccount1.setAccount(id2);
                    partyAccount1.setIbanAcct(iban2);
                    partyDto1.setPartyAcct(partyAccount1);
                }
                bankToCustomerDebitCreditNotification.setDebitParty(partyDto1);
-            }
+            }else {
-            //<Ntfctn><Ntry><NtryDtls><TxDtls><RltdPties><Dbtr><Pty><Id><OrgId><AnyBIC>
+                //<Ntfctn><Ntry><NtryDtls><TxDtls><RltdPties><Dbtr><Pty><Id><OrgId><AnyBIC>
-            //<Ntfctn><Ntry><NtryDtls><TxDtls><RltdPties><Dbtr><Pty><Nm>
+                //<Ntfctn><Ntry><NtryDtls><TxDtls><RltdPties><Dbtr><Pty><Nm>
-            //<Ntfctn><Ntry><NtryDtls><TxDtls><RltdPties><Dbtr><Pty><PstlAdr><AdrLine>
+                //<Ntfctn><Ntry><NtryDtls><TxDtls><RltdPties><Dbtr><Pty><PstlAdr><AdrLine>
-            String bicfi2 = getXmlNodeValue(bodyHdrParentElementName,document,"Ntfctn.Ntry.NtryDtls.TxDtls("+1+").RltdAgts.DbtrAgt.FinInstnId.BICFI");
+                String bicfi2 = getXmlNodeValue(bodyHdrParentElementName,document,"Ntfctn.Ntry.NtryDtls.TxDtls("+1+").RltdAgts.DbtrAgt.FinInstnId.BICFI");
-            String name2 = getXmlNodeValue(bodyHdrParentElementName,document,"Ntfctn.Ntry.NtryDtls.TxDtls("+1+").RltdAgts.DbtrAgt.FinInstnId.Nm");
+                String name2 = getXmlNodeValue(bodyHdrParentElementName,document,"Ntfctn.Ntry.NtryDtls.TxDtls("+1+").RltdAgts.DbtrAgt.FinInstnId.Nm");
-            String mmbId2 = getXmlNodeValue(bodyHdrParentElementName,document,"Ntfctn.Ntry.NtryDtls.TxDtls("+1+").RltdAgts.DbtrAgt.FinInstnId.ClrSysMmbId.MmbId");
+                String mmbId2 = getXmlNodeValue(bodyHdrParentElementName,document,"Ntfctn.Ntry.NtryDtls.TxDtls("+1+").RltdAgts.DbtrAgt.FinInstnId.ClrSysMmbId.MmbId");
-            String cd2 = getXmlNodeValue(bodyHdrParentElementName,document,"Ntfctn.Ntry.NtryDtls.TxDtls("+1+").RltdAgts.DbtrAgt.FinInstnId.ClrSysMmbId.ClrSysId.Cd");
+                String cd2 = getXmlNodeValue(bodyHdrParentElementName,document,"Ntfctn.Ntry.NtryDtls.TxDtls("+1+").RltdAgts.DbtrAgt.FinInstnId.ClrSysMmbId.ClrSysId.Cd");
-            PartyDto partyDto = new PartyDto();
+                PartyDto partyDto = new PartyDto();
-            if(bicfi2!=null){
+                if(bicfi2!=null){
-                partyDto.setPartyBic(bicfi2);
+                    partyDto.setPartyBic(bicfi2);
-                if(mmbId2!=null){
+                    if(mmbId2!=null){
-                    ClearingSystemMember clrSysMmb2 = new ClearingSystemMember();
+                        ClearingSystemMember clrSysMmb2 = new ClearingSystemMember();
-                    clrSysMmb2.setId(mmbId2);
+                        clrSysMmb2.setId(mmbId2);
-                    clrSysMmb2.setCode(cd2);
+                        clrSysMmb2.setCode(cd2);
-                    partyDto.setClrSysMmb(clrSysMmb2);
+                        partyDto.setClrSysMmb(clrSysMmb2);
-                }
+                    }
-                bankToCustomerDebitCreditNotification.setDebitAgtParty(partyDto);
+                    bankToCustomerDebitCreditNotification.setDebitAgtParty(partyDto);
-            }else if(name2!=null){
+                }else if(name2!=null){
-                partyDto.setPartyName(name2);
+                    partyDto.setPartyName(name2);
-                int adrLineCount = getXmlNodeCounts(bodyHdrParentElementName, document, "Ntfctn.Ntry.NtryDtls.TxDtls("+1+").RltdAgts.DbtrAgt.FinInstnId.PstlAdr.AdrLine");
+                    int adrLineCount = getXmlNodeCounts(bodyHdrParentElementName, document, "Ntfctn.Ntry.NtryDtls.TxDtls("+1+").RltdAgts.DbtrAgt.FinInstnId.PstlAdr.AdrLine");
-                if(adrLineCount>0){
+                    if(adrLineCount>0){
-                    for (int i=0; i<adrLineCount; i++) {
+                        for (int i=0; i<adrLineCount; i++) {
-                        if (i == 3) {
+                            if (i == 3) {
-                            break;
+                                break;
+                            }
+                            String adrLine = getXmlNodeValue(bodyHdrParentElementName, document, "Ntfctn.Ntry.NtryDtls.TxDtls("+1+").RltdAgts.DbtrAgt.FinInstnId.PstlAdr.AdrLine("+i+")");
+                            if (adrLine.length() > 35) adrLine = adrLine.substring(0, 35);
+                            partyDto.addAddress(adrLine);
                        }
-                        String adrLine = getXmlNodeValue(bodyHdrParentElementName, document, "Ntfctn.Ntry.NtryDtls.TxDtls("+1+").RltdAgts.DbtrAgt.FinInstnId.PstlAdr.AdrLine("+i+")");
-                        if (adrLine.length() > 35) adrLine = adrLine.substring(0, 35);
-                        partyDto.addAddress(adrLine);
                    }
+                    if(mmbId2!=null){
+                        ClearingSystemMember clrSysMmb2 = new ClearingSystemMember();
+                        clrSysMmb2.setId(mmbId2);
+                        clrSysMmb2.setCode(cd2);
+                        partyDto.setClrSysMmb(clrSysMmb2);
+                    }
+                    bankToCustomerDebitCreditNotification.setDebitAgtParty(partyDto);
                }
-                if(mmbId2!=null){
-                    ClearingSystemMember clrSysMmb2 = new ClearingSystemMember();
-                    clrSysMmb2.setId(mmbId2);
-                    clrSysMmb2.setCode(cd2);
-                    partyDto.setClrSysMmb(clrSysMmb2);
-                }
-                bankToCustomerDebitCreditNotification.setDebitAgtParty(partyDto);
            }
            //<Ntfctn><Ntry><NtryDtls><TxDtls><RltdAgts><IntrmyAgt1><FinInstnId><BICFI>
            //<Ntfctn><Ntry><NtryDtls><TxDtls><RltdAgts><IntrmyAgt1><FinInstnId><ClrSysMmbId><ClrSysId><Cd>

--- a/swiftCore/src/main/java/com/brilliance/swift/mx2swiftdto/bankcusta/Mx2SwiftDtoBTCSCreator.java
+++ b/swiftCore/src/main/java/com/brilliance/swift/mx2swiftdto/bankcusta/Mx2SwiftDtoBTCSCreator.java
--- a/swiftCore/src/main/java/com/brilliance/swift/swiftdto2mx/SwiftDto2MxCreatorManager.java
+++ b/swiftCore/src/main/java/com/brilliance/swift/swiftdto2mx/SwiftDto2MxCreatorManager.java
 package com.brilliance.swift.swiftdto2mx;
 import com.brilliance.swift.exception.SwiftException;
+import com.brilliance.swift.swiftdto2mx.camt053001.v08.SwiftDto2MxCamt053001Creator;
 import com.brilliance.swift.swiftdto2mx.camt054001.v08.SwiftDto2MxCamt054001Creator;
 import com.brilliance.swift.swiftdto2mx.pacs008001.v09.SwiftDto2MxPacs008001Creator;
 import com.brilliance.swift.swiftdto2mx.pacs009001.v09.SwiftDto2MxPacs009001Creator;
@@ -25,6 +26,8 @@ public class SwiftDto2MxCreatorManager {
            return new SwiftDto2MxPacs009001Creator();
        } else if("camt.054.001".equals(messageType)){
            return new SwiftDto2MxCamt054001Creator();
+        } else if("camt.053.001".equals(messageType)){
+            return new SwiftDto2MxCamt053001Creator();
        } else {
            throw new SwiftException("Invalid message type");
        }

--- a/swiftCore/src/main/java/com/brilliance/swift/swiftdto2mx/camt053001/v08/SwiftDto2MxCamt053001Creator.java
+++ b/swiftCore/src/main/java/com/brilliance/swift/swiftdto2mx/camt053001/v08/SwiftDto2MxCamt053001Creator.java
--- a/swiftCore/src/main/java/com/brilliance/swift/swiftdto2mx/camt054001/v08/SwiftDto2MxCamt054001Creator.java
+++ b/swiftCore/src/main/java/com/brilliance/swift/swiftdto2mx/camt054001/v08/SwiftDto2MxCamt054001Creator.java
@@ -101,11 +101,10 @@ public class SwiftDto2MxCamt054001Creator extends AbstractSwiftDto2MxCreator {
            rltdPties.setDbtr(dbtr);
            PartyIdentification135 pty = new PartyIdentification135();
            dbtr.setPty(pty);
-            if(endToEndId!=null){
+            TransactionReferences6 refs =new TransactionReferences6();
-                TransactionReferences6 refs =new TransactionReferences6();
+            refs.setEndToEndId(endToEndId);
-                refs.setEndToEndId(endToEndId);
+            refs.setUETR(bankToCustomerDebitCreditNotification.getUetr());
-                txDtls.setRefs(refs);
+            txDtls.setRefs(refs);
-            }
            //IBAN Othr/Id
            if(account!=null||ibanAcct!=null){
                CashAccount39 acct = new CashAccount39();

--- a/swiftCore/src/main/java/com/brilliance/swift/vo/BankToCustomerStatement.java
+++ b/swiftCore/src/main/java/com/brilliance/swift/vo/BankToCustomerStatement.java
@@ -88,8 +88,8 @@ public class BankToCustomerStatement extends SwiftDto{
        return forwardAvailableBalance;
    }
-    public BankToCustomerStatement addBalDtoSixFive(BalDto balDtoSixFive) {
+    public BankToCustomerStatement addForwardAvailableBalance(BalDto forwardAvailableBalance) {
-        getForwardAvailableBalance().add(balDtoSixFive);
+        getForwardAvailableBalance().add(forwardAvailableBalance);
        return this;
    }
@@ -105,11 +105,10 @@ public class BankToCustomerStatement extends SwiftDto{
        return this;
    }
-    public BankToCustomerStatement addNtryDto(statementBreakdown statementBreakdown){
+    public BankToCustomerStatement addStatementLine(statementBreakdown statementBreakdown){
        getStatementLine().add(statementBreakdown);
        return this;
    }
    public List<statementBreakdown> getStatementLine() {
        if(statementLine == null){
            statementLine = new ArrayList<>();

--- a/swiftCore/src/main/java/com/brilliance/swift/vo/common/statementBreakdown.java
+++ b/swiftCore/src/main/java/com/brilliance/swift/vo/common/statementBreakdown.java
@@ -15,7 +15,7 @@ public class statementBreakdown {
    private String cdtDbtInd;
-    private String rvslInd = "false";
+    private String rvslInd;
    private String ccy;

--- a/swiftCore/src/main/resources/swiftJson/BankToCustomerCreditNotification.json
+++ b/swiftCore/src/main/resources/swiftJson/BankToCustomerCreditNotification.json
@@ -17,18 +17,6 @@
      "TEST3"
    ]
  },
-  "debitAgtParty": {
-    "partyName": "Creditor 2",
-    "addressList": [
-      "TEST111",
-      "TEST222",
-      "TEST333"
-    ],
-    "clrSysMmb": {
-      "code": "ATBLZ",
-      "id": "FR7630588000010050000143176"
-    }
-  },
  "intrmyAgtParty": {
    "partyName": "81939316",
    "addressList": [
@@ -47,5 +35,6 @@
  "receiverBic": "DEUTNL2A",
  "createDate": "2022-04-29 16:06:51,839",
  "messagePriority": "NORM",
-  "messageId": "FRDA000003421606"
+  "messageId": "FRDA000003421606",
+  "uetr": "8a562c67-ca16-48ba-b074-65581be6f001"
 }
--- a/swiftCore/src/main/resources/swiftJson/BankToCustomerDebitNotification.json
+++ b/swiftCore/src/main/resources/swiftJson/BankToCustomerDebitNotification.json
@@ -10,12 +10,16 @@
    "amt": 126
  },
  "debitAgtParty": {
-    "partyName": "Creditor 1",
+    "partyName": "Creditor 2",
    "addressList": [
-      "TEST1",
+      "TEST111",
-      "TEST2",
+      "TEST222",
-      "TEST3"
+      "TEST333"
-    ]
+    ],
+    "clrSysMmb": {
+      "code": "ATBLZ",
+      "id": "FR7630588000010050000143176"
+    }
  },
  "addtlTxInf": "ENRICHED|TRUE SETT_METHOD|SEPA IAT_IND|FALSE DOMESTIC_IND|FALSE PRIORITY_IND|FALSEENRICHED|TRUE SETT_METHOD|SEPA IAT_ENRICHED|TRUE SETT_METHOD|SEPA IAT_ENRICHED|TRUE SETT_METHOD|SEPA IAT_ENRICHED|TRUE SETT_METH",
  "messageType": "camt.054.001",
@@ -23,5 +27,6 @@
  "receiverBic": "DEUTNL2A",
  "createDate": "2022-04-29 16:06:27,410",
  "messagePriority": "NORM",
-  "messageId": "FRDA000003421606"
+  "messageId": "FRDA000003421606",
+  "uetr": "8a562c67-ca16-48ba-b074-65581be6f001"
 }
--- a/swiftCore/src/main/resources/swiftJson/BankToCustomerStatement.json
+++ b/swiftCore/src/main/resources/swiftJson/BankToCustomerStatement.json
@@ -72,5 +72,6 @@
  "receiverBic": "BJWHS12X",
  "createDate": "2022-04-28 10:23:46,048",
  "messagePriority": "NORM",
-  "messageId": "00010013800002001234"
+  "messageId": "00010013800002001234",
+  "uetr": "8a562c67-ca16-48ba-b074-65581be6f001"
 }
--- a/swiftCore/src/main/resources/swiftJson/BankToStatement.json
+++ b/swiftCore/src/main/resources/swiftJson/BankToStatement.json
@@ -52,5 +52,6 @@
  "receiverBic": "BJWHS12X",
  "createDate": "2022-04-28 10:24:00,960",
  "messagePriority": "NORM",
-  "messageId": "00010013800002001234"
+  "messageId": "00010013800002001234",
-}
+  "uetr": "8a562c67-ca16-48ba-b074-65581be6f001"
\ No newline at end of file
+}
--- a/swiftCore/src/main/resources/swiftTxt/MT900.txt
+++ b/swiftCore/src/main/resources/swiftTxt/MT900.txt
-{1:F01DEUTNL2AAXXX3540051324}{2:O9001606220429DEUTDEFFAXXX76313442662205041740N}{3:{108:2205041740590623}}{4:
+{1:F01DEUTNL2AAXXX0815563368}{2:O9001606220429DEUTDEFFAXXX47850332752205051732N}{3:{108:2205051732400583}{121:8a562c67-ca16-48ba-b074-65581be6f001}}{4:
 :20:FRDA000003421606
 :21:E2E1201
 :25:S15612345678012345
 :32A:220330EUR126,
-:52D:Creditor 1
+:52D://ATFR7630588000010050000143176
-TEST1
+Creditor 2
-TEST2
+TEST111
-TEST3
+TEST222
+TEST333
 :72:ENRICHED|TRUE SETT_METHOD|SEPA IAT_
 IND|FALSE DOMESTIC_IND|FALSE PRIORI
 TY_IND|FALSEENRICHED|TRUE SETT_METH

--- a/swiftCore/src/main/resources/swiftTxt/MT910.txt
+++ b/swiftCore/src/main/resources/swiftTxt/MT910.txt
-{1:F01DEUTNL2AAXXX0508466280}{2:O9101606220429DEUTDEFFAXXX58867078842205041741N}{3:{108:2205041741090259}}{4:
+{1:F01DEUTNL2AAXXX1363068546}{2:O9101606220429DEUTDEFFAXXX41465024152205051732N}{3:{108:2205051732480335}{121:8a562c67-ca16-48ba-b074-65581be6f001}}{4:
 :20:FRDA000003421606
 :21:E2E1201
 :25:S15612345678012345
@@ -7,11 +7,6 @@
 TEST1
 TEST2
 TEST3
-:52D://ATFR7630588000010050000143176
-Creditor 2
-TEST111
-TEST222
-TEST333
 :56D://ATFR7630588000010050000143176
 81939316
 ADDRESS 1

--- a/swiftCore/src/main/resources/swiftTxt/MT940.txt
+++ b/swiftCore/src/main/resources/swiftTxt/MT940.txt
-{1:F01BJWHS12XAXXX4217215823}{2:O9401010200908SHWHQWERA12385857271451725220418N}{4:
+{1:F01BJWHS12XAXXX7583545445}{2:O9401023220428SHWHQWERA12348676666142205051522N}{3:{108:2205051522140540}{121:8a562c67-ca16-48ba-b074-65581be6f001}}{4:
 :20:00010013800002001234
 :25:S15612345678012345
-:28C:178/200
+:28:178/200
-:60M:D220330USD120274,34
+:60M:D220330USD120274.34
-:61:220330220330DUSD393,17FCHKS100000189-735//1309170100000390154395
+:61:220330220330DUSD393.17FCHKS100000189-735//1309170100000390154395
 PLACI LOVECNAMENSKIH WUHAN
 :86:CHINESE BEIJING
-:61:220330220330DUSD445,FCHKS100000189-735//1309170100000390154395
+:61:220330220330DUSD445FCHKS100000189-735//1309170100000390154395
 PLACI LOVECNAMENSKIH STORITEV
-:62M:D220330USD123456,29
+:62M:D220330USD123456.29
-:64:D220330USD119609,29
+:64:D220330USD119609.29
-:65:D220330USD120274,34
+:65:D220330USD120274.34
 :86:HELLO WORLD
 -}
\ No newline at end of file
--- a/swiftCore/src/main/resources/swiftTxt/MT950.txt
+++ b/swiftCore/src/main/resources/swiftTxt/MT950.txt
-{1:F01BJWHS12XAXXX6654136341}{2:O9501010200908SHWHQWERA12378761733011729220418N}{4:
+{1:F01BJWHS12XAXXX3202321018}{2:O9401024220428SHWHQWERA12308503578012205051522N}{3:{108:2205051522260719}{121:8a562c67-ca16-48ba-b074-65581be6f001}}{4:
 :20:00010013800002001234
 :25:S15612345678012345
-:28C:178/200
+:28:178/200
-:60M:D220330USD120274,34
+:60M:D220330USD120274.34
-:61:220330220330DUSD393,17FCHKS100000189-735//1309170100000390154395
+:61:220330220330DUSD393.17FCHKS100000189-735//1309170100000390154395
 PLACI LOVECNAMENSKIH WUHAN
-:61:220330220330DUSD445,FCHKS100000189-735//1309170100000390154395
+:61:220330220330DUSD445FCHKS100000189-735//1309170100000390154395
 PLACI LOVECNAMENSKIH STORITEV
-:62M:D220330USD123456,29
+:62M:D220330USD123456.29
 -}
\ No newline at end of file
--- a/swiftCore/src/main/resources/swiftXml/MxCamt05300108_940.xml
+++ b/swiftCore/src/main/resources/swiftXml/MxCamt05300108_940.xml
+<?xml version="1.0" encoding="UTF-8" ?>
+<RequestPayload>
+<AppHdr xmlns="urn:iso:std:iso:20022:tech:xsd:head.001.001.02">
+    <Fr>
+        <FIId>
+            <FinInstnId>
+                <BICFI>SHWHQWER123</BICFI>
+            </FinInstnId>
+        </FIId>
+    </Fr>
+    <To>
+        <FIId>
+            <FinInstnId>
+                <BICFI>BJWHS12X</BICFI>
+            </FinInstnId>
+        </FIId>
+    </To>
+    <BizMsgIdr>00010013800002001234</BizMsgIdr>
+    <MsgDefIdr>camt.053.001.08</MsgDefIdr>
+    <CreDt>2022-04-28T10:23:46.048+08:00</CreDt>
+    <Prty>NORM</Prty>
+</AppHdr>
+<Document xmlns="urn:iso:std:iso:20022:tech:xsd:camt.053.001.08">
+    <BkToCstmrStmt>
+        <GrpHdr>
+            <MsgId>00010013800002001234</MsgId>
+            <CreDtTm>2022-04-28T10:23:46.048+08:00</CreDtTm>
+            <MsgPgntn>
+                <PgNb>178</PgNb>
+                <LastPgInd>false</LastPgInd>
+            </MsgPgntn>
+            <AddtlInf></AddtlInf>
+        </GrpHdr>
+        <Stmt>
+            <ElctrncSeqNb>200</ElctrncSeqNb>
+            <Acct>
+                <Id>
+                    <Othr>
+                        <Id>S15612345678012345</Id>
+                    </Othr>
+                </Id>
+            </Acct>
+            <Bal></Bal>
+            <Bal>
+                <Tp>
+                    <CdOrPrtry>
+                        <Cd>ITBD</Cd>
+                    </CdOrPrtry>
+                </Tp>
+                <Amt Ccy="USD">120274.34</Amt>
+                <CdtDbtInd>DBIT</CdtDbtInd>
+                <Dt>
+                    <Dt>2022-03-30+08:00</Dt>
+                </Dt>
+            </Bal>
+            <Bal>
+                <Tp>
+                    <CdOrPrtry>
+                        <Cd>ITBD</Cd>
+                    </CdOrPrtry>
+                </Tp>
+                <Amt Ccy="USD">123456.29</Amt>
+                <CdtDbtInd>DBIT</CdtDbtInd>
+                <Dt>
+                    <Dt>2022-03-30+08:00</Dt>
+                </Dt>
+            </Bal>
+            <Bal>
+                <Tp>
+                    <CdOrPrtry>
+                        <Cd>CLAV</Cd>
+                    </CdOrPrtry>
+                </Tp>
+                <Amt Ccy="USD">119609.29</Amt>
+                <CdtDbtInd>DBIT</CdtDbtInd>
+                <Dt>
+                    <Dt>2022-03-30+08:00</Dt>
+                </Dt>
+            </Bal>
+            <Bal>
+                <Tp>
+                    <CdOrPrtry>
+                        <Cd>FWAV</Cd>
+                    </CdOrPrtry>
+                </Tp>
+                <Amt Ccy="USD">120274.34</Amt>
+                <CdtDbtInd>DBIT</CdtDbtInd>
+                <Dt>
+                    <Dt>2022-03-30+08:00</Dt>
+                </Dt>
+            </Bal>
+            <Ntry></Ntry>
+            <Ntry>
+                <Amt Ccy="USD">393.17</Amt>
+                <CdtDbtInd>DBIT</CdtDbtInd>
+                <BookgDt>
+                    <Dt>2022-03-30+08:00</Dt>
+                </BookgDt>
+                <ValDt>
+                    <Dt>2022-03-30+08:00</Dt>
+                </ValDt>
+                <AcctSvcrRef>1309170100000390154395</AcctSvcrRef>
+                <BkTxCd>
+                    <Prtry>
+                        <Cd>FCHK</Cd>
+                    </Prtry>
+                </BkTxCd>
+                <NtryDtls>
+                    <TxDtls>
+                        <Refs>
+                            <EndToEndId>S100000189-735</EndToEndId>
+                            <UETR>8a562c67-ca16-48ba-b074-65581be6f001</UETR>
+                        </Refs>
+                        <AddtlTxInf>PLACI LOVECNAMENSKIH WUHAN</AddtlTxInf>
+                    </TxDtls>
+                </NtryDtls>
+                <AddtlNtryInf>CHINESE BEIJING</AddtlNtryInf>
+            </Ntry>
+            <Ntry>
+                <Amt Ccy="USD">445</Amt>
+                <CdtDbtInd>DBIT</CdtDbtInd>
+                <BookgDt>
+                    <Dt>2022-03-30+08:00</Dt>
+                </BookgDt>
+                <ValDt>
+                    <Dt>2022-03-30+08:00</Dt>
+                </ValDt>
+                <AcctSvcrRef>1309170100000390154395</AcctSvcrRef>
+                <BkTxCd>
+                    <Prtry>
+                        <Cd>FCHK</Cd>
+                    </Prtry>
+                </BkTxCd>
+                <NtryDtls>
+                    <TxDtls>
+                        <Refs>
+                            <EndToEndId>S100000189-735</EndToEndId>
+                            <UETR>8a562c67-ca16-48ba-b074-65581be6f001</UETR>
+                        </Refs>
+                        <AddtlTxInf>PLACI LOVECNAMENSKIH STORITEV</AddtlTxInf>
+                    </TxDtls>
+                </NtryDtls>
+            </Ntry>
+            <AddtlStmtInf>HELLO WORLD</AddtlStmtInf>
+        </Stmt>
+    </BkToCstmrStmt>
+</Document>
+</RequestPayload>
\ No newline at end of file
--- a/swiftCore/src/main/resources/swiftXml/MxCamt05300108_950.xml
+++ b/swiftCore/src/main/resources/swiftXml/MxCamt05300108_950.xml
+<?xml version="1.0" encoding="UTF-8" ?>
+<RequestPayload>
+<AppHdr xmlns="urn:iso:std:iso:20022:tech:xsd:head.001.001.02">
+    <Fr>
+        <FIId>
+            <FinInstnId>
+                <BICFI>SHWHQWER123</BICFI>
+            </FinInstnId>
+        </FIId>
+    </Fr>
+    <To>
+        <FIId>
+            <FinInstnId>
+                <BICFI>BJWHS12X</BICFI>
+            </FinInstnId>
+        </FIId>
+    </To>
+    <BizMsgIdr>00010013800002001234</BizMsgIdr>
+    <MsgDefIdr>camt.053.001.08</MsgDefIdr>
+    <CreDt>2022-04-28T10:24:00.960+08:00</CreDt>
+    <Prty>NORM</Prty>
+</AppHdr>
+<Document xmlns="urn:iso:std:iso:20022:tech:xsd:camt.053.001.08">
+    <BkToCstmrStmt>
+        <GrpHdr>
+            <MsgId>00010013800002001234</MsgId>
+            <CreDtTm>2022-04-28T10:24:00.960+08:00</CreDtTm>
+            <MsgPgntn>
+                <PgNb>178</PgNb>
+                <LastPgInd>false</LastPgInd>
+            </MsgPgntn>
+            <AddtlInf></AddtlInf>
+        </GrpHdr>
+        <Stmt>
+            <ElctrncSeqNb>200</ElctrncSeqNb>
+            <Acct>
+                <Id>
+                    <Othr>
+                        <Id>S15612345678012345</Id>
+                    </Othr>
+                </Id>
+            </Acct>
+            <Bal></Bal>
+            <Bal>
+                <Tp>
+                    <CdOrPrtry>
+                        <Cd>ITBD</Cd>
+                    </CdOrPrtry>
+                </Tp>
+                <Amt Ccy="USD">120274.34</Amt>
+                <CdtDbtInd>DBIT</CdtDbtInd>
+                <Dt>
+                    <Dt>2022-03-30+08:00</Dt>
+                </Dt>
+            </Bal>
+            <Bal>
+                <Tp>
+                    <CdOrPrtry>
+                        <Cd>ITBD</Cd>
+                    </CdOrPrtry>
+                </Tp>
+                <Amt Ccy="USD">123456.29</Amt>
+                <CdtDbtInd>DBIT</CdtDbtInd>
+                <Dt>
+                    <Dt>2022-03-30+08:00</Dt>
+                </Dt>
+            </Bal>
+            <Ntry></Ntry>
+            <Ntry>
+                <Amt Ccy="USD">393.17</Amt>
+                <CdtDbtInd>DBIT</CdtDbtInd>
+                <BookgDt>
+                    <Dt>2022-03-30+08:00</Dt>
+                </BookgDt>
+                <ValDt>
+                    <Dt>2022-03-30+08:00</Dt>
+                </ValDt>
+                <AcctSvcrRef>1309170100000390154395</AcctSvcrRef>
+                <BkTxCd>
+                    <Prtry>
+                        <Cd>FCHK</Cd>
+                    </Prtry>
+                </BkTxCd>
+                <NtryDtls>
+                    <TxDtls>
+                        <Refs>
+                            <EndToEndId>S100000189-735</EndToEndId>
+                            <UETR>8a562c67-ca16-48ba-b074-65581be6f001</UETR>
+                        </Refs>
+                        <AddtlTxInf>PLACI LOVECNAMENSKIH WUHAN</AddtlTxInf>
+                    </TxDtls>
+                </NtryDtls>
+            </Ntry>
+            <Ntry>
+                <Amt Ccy="USD">445</Amt>
+                <CdtDbtInd>DBIT</CdtDbtInd>
+                <BookgDt>
+                    <Dt>2022-03-30+08:00</Dt>
+                </BookgDt>
+                <ValDt>
+                    <Dt>2022-03-30+08:00</Dt>
+                </ValDt>
+                <AcctSvcrRef>1309170100000390154395</AcctSvcrRef>
+                <BkTxCd>
+                    <Prtry>
+                        <Cd>FCHK</Cd>
+                    </Prtry>
+                </BkTxCd>
+                <NtryDtls>
+                    <TxDtls>
+                        <Refs>
+                            <EndToEndId>S100000189-735</EndToEndId>
+                            <UETR>8a562c67-ca16-48ba-b074-65581be6f001</UETR>
+                        </Refs>
+                        <AddtlTxInf>PLACI LOVECNAMENSKIH STORITEV</AddtlTxInf>
+                    </TxDtls>
+                </NtryDtls>
+            </Ntry>
+        </Stmt>
+    </BkToCstmrStmt>
+</Document>
+</RequestPayload>
\ No newline at end of file
--- a/swiftCore/src/main/resources/swiftXml/MxCamt05400108_CREDIT.xml
+++ b/swiftCore/src/main/resources/swiftXml/MxCamt05400108_CREDIT.xml
@@ -45,6 +45,7 @@
                    <TxDtls>
                        <Refs>
                            <EndToEndId>E2E1201</EndToEndId>
+                            <UETR>8a562c67-ca16-48ba-b074-65581be6f001</UETR>
                        </Refs>
                        <RltdPties>
                            <Dbtr>
@@ -78,26 +79,6 @@
                        </RltdAgts>
                        <AddtlTxInf>ENRICHED|TRUE SETT_METHOD|SEPA IAT_IND|FALSE DOMESTIC_IND|FALSE PRIORITY_IND|FALSE</AddtlTxInf>
                    </TxDtls>
-                    <TxDtls>
-                        <RltdAgts>
-                            <DbtrAgt>
-                                <FinInstnId>
-                                    <ClrSysMmbId>
-                                        <ClrSysId>
-                                            <Cd>ATBLZ</Cd>
-                                        </ClrSysId>
-                                        <MmbId>FR7630588000010050000143176</MmbId>
-                                    </ClrSysMmbId>
-                                    <Nm>Creditor 2</Nm>
-                                    <PstlAdr>
-                                        <AdrLine>TEST111</AdrLine>
-                                        <AdrLine>TEST222</AdrLine>
-                                        <AdrLine>TEST333</AdrLine>
-                                    </PstlAdr>
-                                </FinInstnId>
-                            </DbtrAgt>
-                        </RltdAgts>
-                    </TxDtls>
                </NtryDtls>
            </Ntry>
        </Ntfctn>

--- a/swiftCore/src/main/resources/swiftXml/MxCamt05400108_DEBIT.xml
+++ b/swiftCore/src/main/resources/swiftXml/MxCamt05400108_DEBIT.xml
@@ -45,6 +45,7 @@
                    <TxDtls>
                        <Refs>
                            <EndToEndId>E2E1201</EndToEndId>
+                            <UETR>8a562c67-ca16-48ba-b074-65581be6f001</UETR>
                        </Refs>
                        <RltdPties>
                            <Dbtr>
@@ -57,11 +58,17 @@
                        <RltdAgts>
                            <DbtrAgt>
                                <FinInstnId>
-                                    <Nm>Creditor 1</Nm>
+                                    <ClrSysMmbId>
+                                        <ClrSysId>
+                                            <Cd>ATBLZ</Cd>
+                                        </ClrSysId>
+                                        <MmbId>FR7630588000010050000143176</MmbId>
+                                    </ClrSysMmbId>
+                                    <Nm>Creditor 2</Nm>
                                    <PstlAdr>
-                                        <AdrLine>TEST1</AdrLine>
+                                        <AdrLine>TEST111</AdrLine>
-                                        <AdrLine>TEST2</AdrLine>
+                                        <AdrLine>TEST222</AdrLine>
-                                        <AdrLine>TEST3</AdrLine>
+                                        <AdrLine>TEST333</AdrLine>
                                    </PstlAdr>
                                </FinInstnId>
                            </DbtrAgt>

--- a/swiftCore/src/test/java/com/brilliance/mt2swiftdto/camt053001/Test940Camt053001.java
+++ b/swiftCore/src/test/java/com/brilliance/mt2swiftdto/camt053001/Test940Camt053001.java
@@ -9,7 +9,7 @@ public class Test940Camt053001 {
    public static void main(String[] args) {
        File file = new File(System.getProperty("user.dir")+"\\swiftCore\\src\\main\\resources\\swiftTxt\\MT940.txt");
-        SwiftDto swiftDto = new SwiftTransfer().mt2SwiftDto(file, "D:/test1/BankToCustomerStatement.json", null);
+        SwiftDto swiftDto = new SwiftTransfer().mt2SwiftDto(file, "D:/MtToSwift/BankToCustomerStatement.json", null);
        System.out.println(swiftDto.toString());
    }
 }
--- a/swiftCore/src/test/java/com/brilliance/mt2swiftdto/camt053001/Test950Camt053001.java
+++ b/swiftCore/src/test/java/com/brilliance/mt2swiftdto/camt053001/Test950Camt053001.java
@@ -9,7 +9,7 @@ public class Test950Camt053001 {
    public static void main(String[] args) {
        File file = new File(System.getProperty("user.dir")+"\\swiftCore\\src\\main\\resources\\swiftTxt\\MT950.txt");
-        SwiftDto swiftDto = new SwiftTransfer().mt2SwiftDto(file, "D:/test1/BankToStatement.json", null);
+        SwiftDto swiftDto = new SwiftTransfer().mt2SwiftDto(file, "D:/MtToSwift/BankToStatement.json", null);
        System.out.println(swiftDto.toString());
    }
 }
--- a/swiftCore/src/test/java/com/brilliance/mx2swiftdto/bankcusta/Test940.java
+++ b/swiftCore/src/test/java/com/brilliance/mx2swiftdto/bankcusta/Test940.java
+package com.brilliance.mx2swiftdto.bankcusta;
+import com.brilliance.swift.SwiftTransfer;
+import com.brilliance.swift.vo.SwiftDto;
+import java.io.File;
+public class Test940 {
+    public static void main(String[] args) {
+        SwiftDto swiftDto = SwiftTransfer.mx2SwiftDto(new File(System.getProperty("user.dir")+"\\swiftCore\\src\\main\\resources\\swiftXml\\MxCamt05300108_940.xml"), "D:/MxToSwift/BankToCustomerStatement.json", null);
+        System.out.println(swiftDto);
+    }
+}
--- a/swiftCore/src/test/java/com/brilliance/mx2swiftdto/bankcusta/Test950.java
+++ b/swiftCore/src/test/java/com/brilliance/mx2swiftdto/bankcusta/Test950.java
+package com.brilliance.mx2swiftdto.bankcusta;
+import com.brilliance.swift.SwiftTransfer;
+import com.brilliance.swift.vo.SwiftDto;
+import java.io.File;
+public class Test950 {
+    public static void main(String[] args) {
+        SwiftDto swiftDto = SwiftTransfer.mx2SwiftDto(new File(System.getProperty("user.dir")+"\\swiftCore\\src\\main\\resources\\swiftXml\\MxCamt05300108_950.xml"), "D:/MxToSwift/BankToStatement.json", null);
+        System.out.println(swiftDto);
+    }
+}
--- a/swiftCore/src/test/java/com/brilliance/swiftdto2mt/mt900/Test.java
+++ b/swiftCore/src/test/java/com/brilliance/swiftdto2mt/mt900/Test.java
 package com.brilliance.swiftdto2mt.mt900;
+import com.brilliance.swift.SwiftTransfer;
 import com.brilliance.swift.swiftdto2mt.SwiftDto2MtCreatorManager;
 import java.io.File;
@@ -8,7 +9,7 @@ public class Test {
    public static void main(String[] args) {
        File file = new File(System.getProperty("user.dir")+"\\swiftCore\\src\\main\\resources\\swiftJson\\BankToCustomerDebitNotification.json");
-        String mtStr = SwiftTransfer.swiftDto2Mt(file, "D:/test2/MT900.txt", null);
+        String mtStr = SwiftTransfer.swiftDto2Mt(file, "D:/SwiftToMt/MT900.txt", null);
        System.out.println(mtStr);
    }
 }
--- a/swiftCore/src/test/java/com/brilliance/swiftdto2mt/mt910/Test.java
+++ b/swiftCore/src/test/java/com/brilliance/swiftdto2mt/mt910/Test.java
 package com.brilliance.swiftdto2mt.mt910;
+import com.brilliance.swift.SwiftTransfer;
 import com.brilliance.swift.swiftdto2mt.SwiftDto2MtCreatorManager;
 import java.io.File;
@@ -8,7 +9,7 @@ public class Test {
    public static void main(String[] args) {
        File file = new File(System.getProperty("user.dir")+"\\swiftCore\\src\\main\\resources\\swiftJson\\BankToCustomerCreditNotification.json");
-        String mtStr = SwiftTransfer.swiftDto2Mt(file, "D:/test2/MT910.txt", null);
+        String mtStr = SwiftTransfer.swiftDto2Mt(file, "D:/SwiftToMt/MT910.txt", null);
        System.out.println(mtStr);
    }
 }
--- a/swiftCore/src/test/java/com/brilliance/swiftdto2mt/mt940/Test.java
+++ b/swiftCore/src/test/java/com/brilliance/swiftdto2mt/mt940/Test.java
@@ -8,7 +8,7 @@ public class Test {
    public static void main(String[] args) {
        File file = new File(System.getProperty("user.dir")+"\\swiftCore\\src\\main\\resources\\swiftJson\\BankToCustomerStatement.json");
-        String mtStr = SwiftTransfer.swiftDto2Mt(file, "D:/test2/MT940.txt", null);
+        String mtStr = SwiftTransfer.swiftDto2Mt(file, "D:/SwiftToMt/MT940.txt", null);
        System.out.println(mtStr);
    }
 }
--- a/swiftCore/src/test/java/com/brilliance/swiftdto2mt/mt950/Test.java
+++ b/swiftCore/src/test/java/com/brilliance/swiftdto2mt/mt950/Test.java
@@ -8,7 +8,7 @@ public class Test {
    public static void main(String[] args) {
        File file = new File(System.getProperty("user.dir")+"\\swiftCore\\src\\main\\resources\\swiftJson\\BankToStatement.json");
-        String mtStr = SwiftTransfer.swiftDto2Mt(file, "D:/test2/MT950.txt", null);
+        String mtStr = SwiftTransfer.swiftDto2Mt(file, "D:/SwiftToMt/MT950.txt", null);
        System.out.println(mtStr);
    }
 }
--- a/swiftCore/src/test/java/com/brilliance/swiftdto2mx/camt053001/Text940camt053001.java
+++ b/swiftCore/src/test/java/com/brilliance/swiftdto2mx/camt053001/Text940camt053001.java
+package com.brilliance.swiftdto2mx.camt053001;
+import com.brilliance.swift.SwiftTransfer;
+import java.io.File;
+/**
+ * @author zh
+ * @create 2022-04-29 10:12
+ */
+public class Text940camt053001 {
+    public static void main(String[] args) {
+        File file = new File(System.getProperty("user.dir")+"\\swiftCore\\src\\main\\resources\\swiftJson\\BankToCustomerStatement.json");
+        String mtStr = SwiftTransfer.swiftDto2Mx(file,"D:/SwiftToMx/MxCamt05300108_940.xml");
+        System.out.println(mtStr);
+    }
+}
--- a/swiftCore/src/test/java/com/brilliance/swiftdto2mx/camt053001/Text950camt053001.java
+++ b/swiftCore/src/test/java/com/brilliance/swiftdto2mx/camt053001/Text950camt053001.java
+package com.brilliance.swiftdto2mx.camt053001;
+import com.brilliance.swift.SwiftTransfer;
+import java.io.File;
+/**
+ * @author zh
+ * @create 2022-04-29 10:12
+ */
+public class Text950camt053001 {
+    public static void main(String[] args) {
+        File file = new File(System.getProperty("user.dir")+"\\swiftCore\\src\\main\\resources\\swiftJson\\BankToStatement.json");
+        String mtStr = SwiftTransfer.swiftDto2Mx(file,"D:/SwiftToMx/MxCamt05300108_950.xml");
+        System.out.println(mtStr);
+    }
+}