Commit 7beda872 by zhanghou

修改了910,900,950,940报文bean中类的属性的名称

parent 4a114cc0
...@@ -5,7 +5,6 @@ import com.brilliance.swift.mt2mx.AbstractMt2MxParseFields; ...@@ -5,7 +5,6 @@ import com.brilliance.swift.mt2mx.AbstractMt2MxParseFields;
import com.brilliance.swift.util.DateUtil; import com.brilliance.swift.util.DateUtil;
import com.brilliance.swift.vo.BankToCustomerStatement; import com.brilliance.swift.vo.BankToCustomerStatement;
import com.brilliance.swift.vo.common.BalDto; import com.brilliance.swift.vo.common.BalDto;
import com.brilliance.swift.vo.common.BalTypeEnum;
import com.prowidesoftware.swift.model.field.Field60M; import com.prowidesoftware.swift.model.field.Field60M;
import com.prowidesoftware.swift.model.mt.AbstractMT; import com.prowidesoftware.swift.model.mt.AbstractMT;
import com.prowidesoftware.swift.model.mt9xx.MT940; import com.prowidesoftware.swift.model.mt9xx.MT940;
...@@ -31,7 +30,7 @@ public class Camt053001Parse60aField extends AbstractMt2MxParseFields { ...@@ -31,7 +30,7 @@ public class Camt053001Parse60aField extends AbstractMt2MxParseFields {
balDto.setDate(DateUtil.parseDate("20"+field60M.getDate(), "yyyyMMdd")); balDto.setDate(DateUtil.parseDate("20"+field60M.getDate(), "yyyyMMdd"));
balDto.setCcy(field60M.getCurrency()); balDto.setCcy(field60M.getCurrency());
balDto.setAmt(field60M.amount()); balDto.setAmt(field60M.amount());
bankToCustomerStatement.setBalDtoSixZero(balDto); bankToCustomerStatement.setOpenBal(balDto);
} }
}else { }else {
MT950 mt950 = (MT950) context.get(AbstractMT.class); MT950 mt950 = (MT950) context.get(AbstractMT.class);
...@@ -44,7 +43,7 @@ public class Camt053001Parse60aField extends AbstractMt2MxParseFields { ...@@ -44,7 +43,7 @@ public class Camt053001Parse60aField extends AbstractMt2MxParseFields {
balDto.setDate(DateUtil.parseDate("20"+field60M.getDate(), "yyyyMMdd")); balDto.setDate(DateUtil.parseDate("20"+field60M.getDate(), "yyyyMMdd"));
balDto.setCcy(field60M.getCurrency()); balDto.setCcy(field60M.getCurrency());
balDto.setAmt(field60M.amount()); balDto.setAmt(field60M.amount());
bankToCustomerStatement.setBalDtoSixZero(balDto); bankToCustomerStatement.setOpenBal(balDto);
} }
} }
}catch (Exception e){ }catch (Exception e){
......
...@@ -5,7 +5,6 @@ import com.brilliance.swift.mt2mx.AbstractMt2MxParseFields; ...@@ -5,7 +5,6 @@ import com.brilliance.swift.mt2mx.AbstractMt2MxParseFields;
import com.brilliance.swift.util.DateUtil; import com.brilliance.swift.util.DateUtil;
import com.brilliance.swift.vo.BankToCustomerStatement; import com.brilliance.swift.vo.BankToCustomerStatement;
import com.brilliance.swift.vo.common.BalDto; import com.brilliance.swift.vo.common.BalDto;
import com.brilliance.swift.vo.common.BalTypeEnum;
import com.prowidesoftware.swift.model.field.Field62M; import com.prowidesoftware.swift.model.field.Field62M;
import com.prowidesoftware.swift.model.mt.AbstractMT; import com.prowidesoftware.swift.model.mt.AbstractMT;
import com.prowidesoftware.swift.model.mt9xx.MT940; import com.prowidesoftware.swift.model.mt9xx.MT940;
...@@ -31,7 +30,7 @@ public class Camt053001Parse62aField extends AbstractMt2MxParseFields { ...@@ -31,7 +30,7 @@ public class Camt053001Parse62aField extends AbstractMt2MxParseFields {
balDto.setDate(DateUtil.parseDate("20"+field62M.getDate(), "yyyyMMdd")); balDto.setDate(DateUtil.parseDate("20"+field62M.getDate(), "yyyyMMdd"));
balDto.setCcy(field62M.getCurrency()); balDto.setCcy(field62M.getCurrency());
balDto.setAmt(field62M.amount()); balDto.setAmt(field62M.amount());
bankToCustomerStatement.setBalDtoSixTwo(balDto); bankToCustomerStatement.setClosBal(balDto);
} }
}else { }else {
MT950 mt950 = (MT950) context.get(AbstractMT.class); MT950 mt950 = (MT950) context.get(AbstractMT.class);
...@@ -44,7 +43,7 @@ public class Camt053001Parse62aField extends AbstractMt2MxParseFields { ...@@ -44,7 +43,7 @@ public class Camt053001Parse62aField extends AbstractMt2MxParseFields {
balDto.setDate(DateUtil.parseDate("20"+field62M.getDate(), "yyyyMMdd")); balDto.setDate(DateUtil.parseDate("20"+field62M.getDate(), "yyyyMMdd"));
balDto.setCcy(field62M.getCurrency()); balDto.setCcy(field62M.getCurrency());
balDto.setAmt(field62M.amount()); balDto.setAmt(field62M.amount());
bankToCustomerStatement.setBalDtoSixTwo(balDto); bankToCustomerStatement.setClosBal(balDto);
} }
} }
}catch (Exception e){ }catch (Exception e){
......
...@@ -5,7 +5,6 @@ import com.brilliance.swift.mt2mx.AbstractMt2MxParseFields; ...@@ -5,7 +5,6 @@ import com.brilliance.swift.mt2mx.AbstractMt2MxParseFields;
import com.brilliance.swift.util.DateUtil; import com.brilliance.swift.util.DateUtil;
import com.brilliance.swift.vo.BankToCustomerStatement; import com.brilliance.swift.vo.BankToCustomerStatement;
import com.brilliance.swift.vo.common.BalDto; import com.brilliance.swift.vo.common.BalDto;
import com.brilliance.swift.vo.common.BalTypeEnum;
import com.prowidesoftware.swift.model.field.Field64; import com.prowidesoftware.swift.model.field.Field64;
import com.prowidesoftware.swift.model.mt.AbstractMT; import com.prowidesoftware.swift.model.mt.AbstractMT;
import com.prowidesoftware.swift.model.mt9xx.MT940; import com.prowidesoftware.swift.model.mt9xx.MT940;
...@@ -29,7 +28,7 @@ public class Camt053001Parse64Field extends AbstractMt2MxParseFields { ...@@ -29,7 +28,7 @@ public class Camt053001Parse64Field extends AbstractMt2MxParseFields {
balDto.setDate(DateUtil.parseDate("20"+field64.getDate(), "yyyyMMdd")); balDto.setDate(DateUtil.parseDate("20"+field64.getDate(), "yyyyMMdd"));
balDto.setCcy(field64.getCurrency()); balDto.setCcy(field64.getCurrency());
balDto.setAmt(field64.amount()); balDto.setAmt(field64.amount());
bankToCustomerStatement.setBalDtoSixFour(balDto); bankToCustomerStatement.setClosAvaBal(balDto);
} }
}else { }else {
MT950 mt950 = (MT950) context.get(AbstractMT.class); MT950 mt950 = (MT950) context.get(AbstractMT.class);
...@@ -40,7 +39,7 @@ public class Camt053001Parse64Field extends AbstractMt2MxParseFields { ...@@ -40,7 +39,7 @@ public class Camt053001Parse64Field extends AbstractMt2MxParseFields {
balDto.setDate(DateUtil.parseDate("20"+field64.getDate(), "yyyyMMdd")); balDto.setDate(DateUtil.parseDate("20"+field64.getDate(), "yyyyMMdd"));
balDto.setCcy(field64.getCurrency()); balDto.setCcy(field64.getCurrency());
balDto.setAmt(field64.amount()); balDto.setAmt(field64.amount());
bankToCustomerStatement.setBalDtoSixFour(balDto); bankToCustomerStatement.setClosAvaBal(balDto);
} }
} }
}catch (Exception e) { }catch (Exception e) {
......
...@@ -5,12 +5,9 @@ import com.brilliance.swift.mt2mx.AbstractMt2MxParseFields; ...@@ -5,12 +5,9 @@ import com.brilliance.swift.mt2mx.AbstractMt2MxParseFields;
import com.brilliance.swift.util.StringUtil; import com.brilliance.swift.util.StringUtil;
import com.brilliance.swift.vo.BankToCustomerDebitCreditNotification; import com.brilliance.swift.vo.BankToCustomerDebitCreditNotification;
import com.brilliance.swift.vo.common.PartyDto; import com.brilliance.swift.vo.common.PartyDto;
import com.brilliance.swift.vo.common.PartyTypeEnum;
import com.prowidesoftware.swift.model.field.Field25;
import com.prowidesoftware.swift.model.field.Field50A; import com.prowidesoftware.swift.model.field.Field50A;
import com.prowidesoftware.swift.model.field.Field50K; import com.prowidesoftware.swift.model.field.Field50K;
import com.prowidesoftware.swift.model.mt.AbstractMT; import com.prowidesoftware.swift.model.mt.AbstractMT;
import com.prowidesoftware.swift.model.mt9xx.MT900;
import com.prowidesoftware.swift.model.mt9xx.MT910; import com.prowidesoftware.swift.model.mt9xx.MT910;
/** /**
...@@ -52,7 +49,7 @@ public class Camt054001Parse50aField extends AbstractMt2MxParseFields { ...@@ -52,7 +49,7 @@ public class Camt054001Parse50aField extends AbstractMt2MxParseFields {
} }
} }
if(partyDto!=null){ if(partyDto!=null){
bankToCustomerDebitCreditNotification.setPartyDtoFiveZero(partyDto); bankToCustomerDebitCreditNotification.setCustomerParty(partyDto);
} }
} }
}catch (Exception e){ }catch (Exception e){
......
...@@ -5,13 +5,10 @@ import com.brilliance.swift.mt2mx.AbstractMt2MxParseFields; ...@@ -5,13 +5,10 @@ import com.brilliance.swift.mt2mx.AbstractMt2MxParseFields;
import com.brilliance.swift.util.StringUtil; import com.brilliance.swift.util.StringUtil;
import com.brilliance.swift.vo.BankToCustomerDebitCreditNotification; import com.brilliance.swift.vo.BankToCustomerDebitCreditNotification;
import com.brilliance.swift.vo.common.PartyDto; import com.brilliance.swift.vo.common.PartyDto;
import com.brilliance.swift.vo.common.PartyTypeEnum;
import com.prowidesoftware.swift.model.field.Field20;
import com.prowidesoftware.swift.model.field.Field52A; import com.prowidesoftware.swift.model.field.Field52A;
import com.prowidesoftware.swift.model.field.Field52D; import com.prowidesoftware.swift.model.field.Field52D;
import com.prowidesoftware.swift.model.mt.AbstractMT; import com.prowidesoftware.swift.model.mt.AbstractMT;
import com.prowidesoftware.swift.model.mt9xx.MT900; import com.prowidesoftware.swift.model.mt9xx.MT900;
import com.prowidesoftware.swift.model.mt9xx.MT910;
/** /**
* @author zh * @author zh
...@@ -47,7 +44,7 @@ public class Camt054001Parse52aField extends AbstractMt2MxParseFields { ...@@ -47,7 +44,7 @@ public class Camt054001Parse52aField extends AbstractMt2MxParseFields {
} }
} }
if (partyDto != null) { if (partyDto != null) {
bankToCustomerDebitCreditNotification.setPartyDtoFiveTwo(partyDto); bankToCustomerDebitCreditNotification.setInstitutionParty(partyDto);
} }
} }
}catch (Exception e) { }catch (Exception e) {
......
...@@ -43,7 +43,7 @@ public class Camt054001Parse56aField extends AbstractMt2MxParseFields { ...@@ -43,7 +43,7 @@ public class Camt054001Parse56aField extends AbstractMt2MxParseFields {
partyDto.setPartyAcct(buildPartyAccount(field56D.getAccount())); partyDto.setPartyAcct(buildPartyAccount(field56D.getAccount()));
} }
if(partyDto!=null){ if(partyDto!=null){
bankToCustomerDebitCreditNotification.setPartyDtoFiveSix(partyDto); bankToCustomerDebitCreditNotification.setIntermediaryParty(partyDto);
} }
} }
}catch (Exception e) { }catch (Exception e) {
......
package com.brilliance.swift.vo; package com.brilliance.swift.vo;
import com.brilliance.swift.vo.common.CcyFormatAmount; import com.brilliance.swift.vo.common.CcyFormatAmount;
import com.brilliance.swift.vo.common.MessagePriority;
import com.brilliance.swift.vo.common.PartyDto; import com.brilliance.swift.vo.common.PartyDto;
import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List;
/** /**
* @author zh * @author zh
...@@ -22,11 +19,11 @@ public class BankToCustomerDebitCreditNotification extends SwiftDto{ ...@@ -22,11 +19,11 @@ public class BankToCustomerDebitCreditNotification extends SwiftDto{
protected CcyFormatAmount valueAmount; protected CcyFormatAmount valueAmount;
protected PartyDto partyDtoFiveZero; protected PartyDto customerParty;
protected PartyDto partyDtoFiveTwo; protected PartyDto institutionParty;
protected PartyDto partyDtoFiveSix; protected PartyDto intermediaryParty;
protected String addtlTxInf; protected String addtlTxInf;
...@@ -62,28 +59,28 @@ public class BankToCustomerDebitCreditNotification extends SwiftDto{ ...@@ -62,28 +59,28 @@ public class BankToCustomerDebitCreditNotification extends SwiftDto{
this.valueAmount = valueAmount; this.valueAmount = valueAmount;
} }
public PartyDto getPartyDtoFiveZero() { public PartyDto getCustomerParty() {
return partyDtoFiveZero; return customerParty;
} }
public void setPartyDtoFiveZero(PartyDto partyDtoFiveZero) { public void setCustomerParty(PartyDto customerParty) {
this.partyDtoFiveZero = partyDtoFiveZero; this.customerParty = customerParty;
} }
public PartyDto getPartyDtoFiveTwo() { public PartyDto getInstitutionParty() {
return partyDtoFiveTwo; return institutionParty;
} }
public void setPartyDtoFiveTwo(PartyDto partyDtoFiveTwo) { public void setInstitutionParty(PartyDto institutionParty) {
this.partyDtoFiveTwo = partyDtoFiveTwo; this.institutionParty = institutionParty;
} }
public PartyDto getPartyDtoFiveSix() { public PartyDto getIntermediaryParty() {
return partyDtoFiveSix; return intermediaryParty;
} }
public void setPartyDtoFiveSix(PartyDto partyDtoFiveSix) { public void setIntermediaryParty(PartyDto intermediaryParty) {
this.partyDtoFiveSix = partyDtoFiveSix; this.intermediaryParty = intermediaryParty;
} }
public String getAddtlTxInf() { public String getAddtlTxInf() {
......
package com.brilliance.swift.vo; package com.brilliance.swift.vo;
import com.brilliance.swift.vo.common.BalDto; import com.brilliance.swift.vo.common.BalDto;
import com.brilliance.swift.vo.common.MessagePriority;
import com.brilliance.swift.vo.common.NtryDto; import com.brilliance.swift.vo.common.NtryDto;
import com.brilliance.swift.vo.common.PartyDto;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date;
import java.util.List; import java.util.List;
/** /**
...@@ -21,15 +18,15 @@ public class BankToCustomerStatement extends SwiftDto{ ...@@ -21,15 +18,15 @@ public class BankToCustomerStatement extends SwiftDto{
protected String elctrncSeqNb; protected String elctrncSeqNb;
protected BalDto balDtoSixZero; protected BalDto openBal;
protected List<NtryDto> ntryDto; protected List<NtryDto> lineNtry;
protected BalDto balDtoSixTwo; protected BalDto closBal;
protected BalDto balDtoSixFour; protected BalDto closAvaBal;
protected List<BalDto> balDtoSixFive; protected List<BalDto> forwAvaBal;
protected List<String> addtlStmtInf; protected List<String> addtlStmtInf;
...@@ -57,31 +54,31 @@ public class BankToCustomerStatement extends SwiftDto{ ...@@ -57,31 +54,31 @@ public class BankToCustomerStatement extends SwiftDto{
this.elctrncSeqNb = elctrncSeqNb; this.elctrncSeqNb = elctrncSeqNb;
} }
public BalDto getBalDtoSixZero() { public BalDto getOpenBal() {
return balDtoSixZero; return openBal;
} }
public void setBalDtoSixZero(BalDto balDtoSixZero) { public void setOpenBal(BalDto openBal) {
this.balDtoSixZero = balDtoSixZero; this.openBal = openBal;
} }
public BalDto getBalDtoSixFour() { public BalDto getClosAvaBal() {
return balDtoSixFour; return closAvaBal;
} }
public void setBalDtoSixFour(BalDto balDtoSixFour) { public void setClosAvaBal(BalDto closAvaBal) {
this.balDtoSixFour = balDtoSixFour; this.closAvaBal = closAvaBal;
} }
public List<BalDto> getBalDtoSixFive() { public List<BalDto> getForwAvaBal() {
if(balDtoSixFive == null){ if(forwAvaBal == null){
balDtoSixFive = new ArrayList<>(); forwAvaBal = new ArrayList<>();
} }
return balDtoSixFive; return forwAvaBal;
} }
public BankToCustomerStatement addBalDtoSixFive(BalDto balDtoSixFive) { public BankToCustomerStatement addBalDtoSixFive(BalDto balDtoSixFive) {
getBalDtoSixFive().add(balDtoSixFive); getForwAvaBal().add(balDtoSixFive);
return this; return this;
} }
...@@ -98,22 +95,22 @@ public class BankToCustomerStatement extends SwiftDto{ ...@@ -98,22 +95,22 @@ public class BankToCustomerStatement extends SwiftDto{
} }
public BankToCustomerStatement addNtryDto(NtryDto ntryDto){ public BankToCustomerStatement addNtryDto(NtryDto ntryDto){
getNtryDto().add(ntryDto); getLineNtry().add(ntryDto);
return this; return this;
} }
public List<NtryDto> getNtryDto() { public List<NtryDto> getLineNtry() {
if(ntryDto == null){ if(lineNtry == null){
ntryDto = new ArrayList<>(); lineNtry = new ArrayList<>();
} }
return ntryDto; return lineNtry;
} }
public BalDto getBalDtoSixTwo() { public BalDto getClosBal() {
return balDtoSixTwo; return closBal;
} }
public void setBalDtoSixTwo(BalDto balDtoSixTwo) { public void setClosBal(BalDto closBal) {
this.balDtoSixTwo = balDtoSixTwo; this.closBal = closBal;
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment