对940,950xml文件和txt文件以及对61进行了修改

swiftCore/src/main/java/com/brilliance/swift/mt2mx/camt053001/impl/Camt053001Parse61Field.java

@@ -25,14 +25,15 @@ public class Camt053001Parse61Field extends AbstractMt2MxParseFields {
                 MT940 mt940 = (MT940) context.get(AbstractMT.class);
                 List<Field61> field61List = mt940.getField61();
                 if(field61List.size()>0) {
-                    NtryDto ntryDto = new NtryDto();
                     for (int i = 0; i < field61List.size(); i++) {
+                        NtryDto ntryDto = new NtryDto();
                         ntryDto.setValDate(DateUtil.parseDate("20"+field61List.get(i).getValueDate(), "yyyyMMdd"));
                         ntryDto.setBookDate(DateUtil.parseDate("20"+field61List.get(i).getEntryDate(), "yyyyMMdd"));
                         ntryDto.setCdtDbtInd(field61List.get(i).getDCMark());
                         ntryDto.setCcy(field61List.get(i).getFundsCode());
                         ntryDto.setAmt(field61List.get(i).amount());
-                        ntryDto.setCd(field61List.get(i).getTransactionType());
+                        ntryDto.setTransactionType(field61List.get(i).getTransactionType());
+                        ntryDto.setIdentificationCode(field61List.get(i).getIdentificationCode());
                         ntryDto.setEndToEndId(field61List.get(i).getReferenceForTheAccountOwner());
                         ntryDto.setAddtlTxInf(field61List.get(i).getReferenceOfTheAccountServicingInstitution());
                         ntryDto.setAddtlNtryInf(field61List.get(i).getSupplementaryDetails());
@@ -43,14 +44,15 @@ public class Camt053001Parse61Field extends AbstractMt2MxParseFields {
                 MT950 mt950 = (MT950) context.get(AbstractMT.class);
                 List<Field61> field61List = mt950.getField61();
                 if(field61List.size()>0) {
-                    NtryDto ntryDto = new NtryDto();
                     for (int i = 0; i < field61List.size(); i++) {
+                        NtryDto ntryDto = new NtryDto();
                         ntryDto.setValDate(DateUtil.parseDate("20"+field61List.get(i).getValueDate(), "yyyyMMdd"));
                         ntryDto.setBookDate(DateUtil.parseDate("20"+field61List.get(i).getEntryDate(), "yyyyMMdd"));
                         ntryDto.setCdtDbtInd(field61List.get(i).getDCMark());
                         ntryDto.setCcy(field61List.get(i).getFundsCode());
                         ntryDto.setAmt(field61List.get(i).amount());
-                        ntryDto.setCd(field61List.get(i).getTransactionType());
+                        ntryDto.setTransactionType(field61List.get(i).getTransactionType());
+                        ntryDto.setIdentificationCode(field61List.get(i).getIdentificationCode());
                         ntryDto.setEndToEndId(field61List.get(i).getReferenceForTheAccountOwner());
                         ntryDto.setAddtlTxInf(field61List.get(i).getReferenceOfTheAccountServicingInstitution());
                         ntryDto.setAddtlNtryInf(field61List.get(i).getSupplementaryDetails());

swiftCore/src/main/java/com/brilliance/swift/vo/common/NtryDto.java

@@ -21,11 +21,11 @@ public class NtryDto {
 
     private BigDecimal amt = BigDecimal.ZERO;
 
-    private String cd;
+    private String transactionType;
 
-    private String endToEndId;
+    private String identificationCode;
 
-    private String acctSvcrRef;
+    private String endToEndId;
 
     private String addtlTxInf;
 
@@ -55,14 +55,6 @@ public class NtryDto {
         this.cdtDbtInd = cdtDbtInd;
     }
 
-    public String getCd() {
-        return cd;
-    }
-
-    public void setCd(String cd) {
-        this.cd = cd;
-    }
-
     public String getCcy() {
         return ccy;
     }
@@ -79,20 +71,28 @@ public class NtryDto {
         this.amt = amt;
     }
 
-    public String getEndToEndId() {
-        return endToEndId;
+    public String getTransactionType() {
+        return transactionType;
     }
 
-    public void setEndToEndId(String endToEndId) {
-        this.endToEndId = endToEndId;
+    public void setTransactionType(String transactionType) {
+        this.transactionType = transactionType;
+    }
+
+    public String getIdentificationCode() {
+        return identificationCode;
     }
 
-    public String getAcctSvcrRef() {
-        return acctSvcrRef;
+    public void setIdentificationCode(String identificationCode) {
+        this.identificationCode = identificationCode;
     }
 
-    public void setAcctSvcrRef(String acctSvcrRef) {
-        this.acctSvcrRef = acctSvcrRef;
+    public String getEndToEndId() {
+        return endToEndId;
+    }
+
+    public void setEndToEndId(String endToEndId) {
+        this.endToEndId = endToEndId;
     }
 
     public String getAddtlTxInf() {

swiftCore/src/main/resources/swiftTxt/MT940.txt

@@ -3,13 +3,13 @@
 :25:S15612345678012345
 :28C:178/200
 :60M:D220330USD120274,34
-:61:220330220330DUSD393,17123456789S100000189-735//1309170100000390154395
+:61:220330220330DUSD393,17FCHKS100000189-735//1309170100000390154395
 PLACI LOVECNAMENSKIH WUHAN
 :86:CHINESE BEIJING
-:61:220330220330DUSD445,123456789S100000189-735//1309170100000390154395
+:61:220330220330DUSD445,FCHKS100000189-735//1309170100000390154395
 PLACI LOVECNAMENSKIH STORITEV
 :62M:D220330USD123456,29
 :64:D220330USD119609,29
 :65:D220330USD120274,34
 :86:HELLO WORLD
--}
\ No newline at end of file
+-}

swiftCore/src/main/resources/swiftTxt/MT950.txt

@@ -3,9 +3,9 @@
 :25:S15612345678012345
 :28C:178/200
 :60M:D220330USD120274,34
-:61:220330220330DUSD393,17123456789S100000189-735//1309170100000390154395
+:61:220330220330DUSD393,17FCHKS100000189-735//1309170100000390154395
 PLACI LOVECNAMENSKIH WUHAN
-:61:220330220330DUSD445,123456789S100000189-735//1309170100000390154395
+:61:220330220330DUSD445,FCHKS100000189-735//1309170100000390154395
 PLACI LOVECNAMENSKIH STORITEV
 :62M:D220330USD123456,29
--}
\ No newline at end of file
+-}

swiftCore/src/main/resources/swiftXml/MxCamt05300102_940.xml

@@ -123,7 +123,7 @@
                     <AcctSvcrRef>1309170100000390154395</AcctSvcrRef>
                     <BkTxCd>
                         <Prtry>
-                            <Cd>123456789</Cd>
+                            <Cd>FCHK</Cd>
                         </Prtry>
                     </BkTxCd>
                     <NtryDtls>
@@ -159,7 +159,7 @@
                     <AcctSvcrRef>1309170100000390154395</AcctSvcrRef>
                     <BkTxCd>
                         <Prtry>
-                            <Cd>123456789</Cd>
+                            <Cd>FCHK</Cd>
                         </Prtry>
                     </BkTxCd>
                     <NtryDtls>
@@ -187,4 +187,4 @@
             </Stmt>
         </BkToCstmrStmt>
     </Document>
-</Envelope>
\ No newline at end of file
+</Envelope>

swiftCore/src/main/resources/swiftXml/MxCamt05300102_950.xml

@@ -110,7 +110,7 @@
                     <AcctSvcrRef>1309170100000390154395</AcctSvcrRef>
                     <BkTxCd>
                         <Prtry>
-                            <Cd>123456789</Cd>
+                            <Cd>FCHK</Cd>
                         </Prtry>
                     </BkTxCd>
                     <NtryDtls>
@@ -145,7 +145,7 @@
                     <AcctSvcrRef>1309170100000390154395</AcctSvcrRef>
                     <BkTxCd>
                         <Prtry>
-                            <Cd>123456789</Cd>
+                            <Cd>FCHK</Cd>
                         </Prtry>
                     </BkTxCd>
                     <NtryDtls>