Commit f7eb60e8 by zhangxingmin

push

parent 046fbd13
......@@ -337,6 +337,7 @@ public class ApiSalaryServiceImpl implements ApiSalaryService {
remittance1.setSalaryBizId(salary.getSalaryBizId());
remittance1.setSalaryRemittanceBizId(RandomStringGenerator.generateBizId16(CommonEnum.UID_TYPE_SALARY_REMITTANCE.getCode()));
remittance1.setBank(dto.getBank1());
remittance1.setBankName(dto.getBank1Name());
remittance1.setAccountEndNo(dto.getAccountEndNo1());
remittance1.setCurrency(dto.getCurrency1());
remittance1.setAmount(dto.getAmount1());
......@@ -347,6 +348,7 @@ public class ApiSalaryServiceImpl implements ApiSalaryService {
remittance2.setSalaryBizId(salary.getSalaryBizId());
remittance2.setSalaryRemittanceBizId(RandomStringGenerator.generateBizId16(CommonEnum.UID_TYPE_SALARY_REMITTANCE.getCode()));
remittance2.setBank(dto.getBank2());
remittance2.setBankName(dto.getBank2Name());
remittance2.setAccountEndNo(dto.getAccountEndNo2());
remittance2.setCurrency(dto.getCurrency2());
remittance2.setAmount(dto.getAmount2());
......
......@@ -49,11 +49,16 @@ public class ApiSalaryBatchAddDTO {
//========以下是薪资汇款明细字段,两个汇款明细对象
/**
* 收款银行1
* 收款银行1ID
*/
private String bank1;
/**
* 收款银行1名称
*/
private String bank1Name;
/**
* 账户尾号1
*/
private String accountEndNo1;
......@@ -79,11 +84,16 @@ public class ApiSalaryBatchAddDTO {
private String remark1;
/**
* 收款银行1
* 收款银行2ID
*/
private String bank2;
/**
* 收款银行2名称
*/
private String bank2Name;
/**
* 账户尾号1
*/
private String accountEndNo2;
......
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