1.修改950/940代码

swiftCore/src/main/java/com/brilliance/swift/mx2swiftdto/AbstractMx2SwiftDtoCreator.java

@@ -228,7 +228,7 @@ public abstract class AbstractMx2SwiftDtoCreator implements Mx2SwiftDtoCreator{
             }
             return cashBalance;
         } catch (ParseException e) {
-            throw new SwiftException(e.getMessage());
+            throw new SwiftException("ERROR", e.getMessage());
         }
     }
 
@@ -237,7 +237,7 @@ public abstract class AbstractMx2SwiftDtoCreator implements Mx2SwiftDtoCreator{
      * @param parentPath
      * @param document
      * @param balancePath
-     * @param balanceType
+     * @param balanceTypeCode
      * @return
      */
     protected List<CashBalance> convertCashBalanceByType(String parentPath, Document document, String balancePath, BalanceTypeCode balanceTypeCode) {
@@ -271,7 +271,7 @@ public abstract class AbstractMx2SwiftDtoCreator implements Mx2SwiftDtoCreator{
             }
             return cashBalances;
         } catch (ParseException e) {
-            throw new SwiftException(e.getMessage());
+            throw new SwiftException("ERROR", e.getMessage());
         }
     }
 }

swiftCore/src/main/java/com/brilliance/swift/mx2swiftdto/bankcusta/Mx2SwiftDtoBTCSCreator.java

@@ -14,6 +14,7 @@ import javax.xml.datatype.DatatypeConfigurationException;
 import javax.xml.datatype.DatatypeFactory;
 import javax.xml.datatype.XMLGregorianCalendar;
 import java.io.File;
+import java.io.IOException;
 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.util.Date;
@@ -66,7 +67,7 @@ public class Mx2SwiftDtoBTCSCreator extends AbstractMx2SwiftDtoCreator {
 
     @Override
     public void groupHeader() throws SwiftException {
-        String pgNb = getXmlNodeValue(appHdrParentElementName,document,"GrpHdr.MsgPgntn.PgNb");
+        String pgNb = getXmlNodeValue(grpHdrParentElementName,document,"GrpHdr.MsgPgntn.PgNb");
         bankToCustomerStatement.setPgNb(pgNb);
     }
 
@@ -145,7 +146,7 @@ public class Mx2SwiftDtoBTCSCreator extends AbstractMx2SwiftDtoCreator {
                     bankToCustomerStatement.addReportEntry(reportEntry);
                 }
             }
-        } catch (Exception e){
+        } catch (ParseException e){
             throw new SwiftException("ERROR", e.getMessage());
         }
     }
@@ -157,7 +158,7 @@ public class Mx2SwiftDtoBTCSCreator extends AbstractMx2SwiftDtoCreator {
             if (StringUtil.isNotEmpty(outputFilePath)) {
                 bankToCustomerStatement.write(new File(outputFilePath));
             }
-        } catch (Exception e) {
+        } catch (IOException e) {
             throw new SwiftException("ERROR", e.getMessage());
         }
     }

swiftCore/src/main/java/com/brilliance/swift/swiftdto2mt/mt940950/impl/Tag25aGenerate.java

@@ -3,7 +3,11 @@ package com.brilliance.swift.swiftdto2mt.mt940950.impl;
 import com.brilliance.swift.exception.SwiftException;
 import com.brilliance.swift.swiftdto2mt.AbstractSwiftDto2MtTagGenerate;
 import com.brilliance.swift.swiftdto2mt.SwiftDto2MtContextIdentifier;
+import com.brilliance.swift.util.StringUtil;
 import com.brilliance.swift.vo.BankToCustomerStatement;
+import com.brilliance.swift.vo.common.ClearingSystemMember;
+import com.brilliance.swift.vo.common.ClearingSystemMemberCode;
+import com.brilliance.swift.vo.common.PartyAccount;
 import com.brilliance.swift.vo.common.PartyDto;
 import com.prowidesoftware.swift.model.SwiftMessage;
 import com.prowidesoftware.swift.model.Tag;
@@ -30,4 +34,34 @@ public class Tag25aGenerate extends AbstractSwiftDto2MtTagGenerate {
             throw new SwiftException("ERROR", e.getMessage());
         }
     }
+
+    protected String getAccount(PartyDto partyDto) {
+        if (partyDto == null) {
+            return null;
+        }
+        String account = "";
+        ClearingSystemMember clrSysMmb = partyDto.getClrSysMmb();
+        if (clrSysMmb != null) {
+            ClearingSystemMemberCode memberCode = getClsSysMemberByValue(clrSysMmb.getCode());
+            if (memberCode != null) {
+                account = "//" + memberCode.desc();
+            } else {
+                account = "//" + clrSysMmb.getCode();
+            }
+            account += clrSysMmb.getId();
+        } else {
+            PartyAccount partyAcct = partyDto.getPartyAcct();
+            if (partyAcct != null) {
+                if ("CUID".equals(partyAcct.getAcctType())) {
+                    account = "//CH" + partyAcct.getAccount();
+                } else {
+                    account = (StringUtil.isNotEmpty(partyAcct.getIbanAcct()) ? partyAcct.getIbanAcct() : partyAcct.getAccount());
+                }
+            }
+        }
+        if (account.length() > 35) {
+            account = account.substring(0, 35);
+        }
+        return account;
+    }
 }

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

-{1:F01BJWHS12XAXXX3202321018}{2:O9401024220428SHWHQWERA12308503578012205051522N}{3:{108:2205051522260719}{121:8a562c67-ca16-48ba-b074-65581be6f001}}{4:
+{1:F01BJWHS12XAXXX3202321018}{2:O9501024220428SHWHQWERA12308503578012205051522N}{3:{108:2205051522260719}{121:8a562c67-ca16-48ba-b074-65581be6f001}}{4:
 :20:00010013800002001234
 :25:S15612345678012345
 :28C:178/200
-:60M:D220330USD120274,34
-:61:220330220330DUSD393,17FCHKS100000189-735//1309170100000390154395
+:60M:D220330USD377583,30
+:61:220330220330DUSD4371,FCHKS100000189-735//1309170100000390154395
 PLACI LOVECNAMENSKIH WUHAN
-:61:220330220330DUSD445FCHKS100000189-735//1309170100000390154395
+:61:220330220430DUSD445,FCHKS100000189-735//1309170100000390154395
 PLACI LOVECNAMENSKIH STORITEV
-:62M:D220330USD123456,29
+:62M:D220330USD3372767,30
 -}
\ No newline at end of file