Commit a4b2e783 authored by hongguangwu's avatar hongguangwu

1.7.21-四大报销

parent 56941cc6
...@@ -890,9 +890,9 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -890,9 +890,9 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
for (EkpBankExcelNoTaxVo detail : detailList) { for (EkpBankExcelNoTaxVo detail : detailList) {
// 0 对公 // 0 对公
if (CommonConstants.ZERO_INT == type) { if (CommonConstants.ZERO_INT == type) {
rdDetail = buildPayRecordDuiGong(detail); rdDetail = buildPayRecordDuiGong(detail, wxNo);
} else { } else {
rdDetail = buildPayRecordDuiSi(detail); rdDetail = buildPayRecordDuiSi(detail, wxNo);
} }
rd.add(rdDetail); rd.add(rdDetail);
} }
...@@ -1115,7 +1115,7 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -1115,7 +1115,7 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
} }
// 对公 // 对公
private MybankEnterprisePayPayentRequestV2.MybankEnterprisePayPayentRequestRdV2 buildPayRecordDuiGong(EkpBankExcelNoTaxVo detail) { private MybankEnterprisePayPayentRequestV2.MybankEnterprisePayPayentRequestRdV2 buildPayRecordDuiGong(EkpBankExcelNoTaxVo detail, String wxNo) {
MybankEnterprisePayPayentRequestV2.MybankEnterprisePayPayentRequestRdV2 payRecord = MybankEnterprisePayPayentRequestV2.MybankEnterprisePayPayentRequestRdV2 payRecord =
new MybankEnterprisePayPayentRequestV2.MybankEnterprisePayPayentRequestRdV2(); new MybankEnterprisePayPayentRequestV2.MybankEnterprisePayPayentRequestRdV2();
...@@ -1125,6 +1125,7 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -1125,6 +1125,7 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
} }
//业务唯一编号:相同指令不重复 //业务唯一编号:相同指令不重复
payRecord.setUniBusiId(fdId); payRecord.setUniBusiId(fdId);
payRecord.setRefNo(wxNo + CommonConstants.DOWN_LINE_STRING + detail.getFdSerialNumber());
//指令顺序号:每笔指令的序号,本包内不重复 //指令顺序号:每笔指令的序号,本包内不重复
payRecord.setiSeqNo(detail.getFdSerialNumber()); payRecord.setiSeqNo(detail.getFdSerialNumber());
//预约日期 //预约日期
...@@ -1208,7 +1209,7 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -1208,7 +1209,7 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
return payRecord; return payRecord;
} }
private MybankEnterprisePayPayentRequestV2.MybankEnterprisePayPayentRequestRdV2 buildPayRecordDuiSi(EkpBankExcelNoTaxVo detail) { private MybankEnterprisePayPayentRequestV2.MybankEnterprisePayPayentRequestRdV2 buildPayRecordDuiSi(EkpBankExcelNoTaxVo detail, String wxNo) {
MybankEnterprisePayPayentRequestV2.MybankEnterprisePayPayentRequestRdV2 payRecord = MybankEnterprisePayPayentRequestV2.MybankEnterprisePayPayentRequestRdV2 payRecord =
new MybankEnterprisePayPayentRequestV2.MybankEnterprisePayPayentRequestRdV2(); new MybankEnterprisePayPayentRequestV2.MybankEnterprisePayPayentRequestRdV2();
String fdId = detail.getFdId(); String fdId = detail.getFdId();
...@@ -1217,6 +1218,7 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -1217,6 +1218,7 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
} }
//业务唯一编号:相同指令不重复 //业务唯一编号:相同指令不重复
payRecord.setUniBusiId(fdId); payRecord.setUniBusiId(fdId);
payRecord.setRefNo(wxNo + CommonConstants.DOWN_LINE_STRING + detail.getFdSerialNumber());
//指令顺序号:每笔指令的序号,本包内不重复 //指令顺序号:每笔指令的序号,本包内不重复
payRecord.setiSeqNo(detail.getFdSerialNumber()); payRecord.setiSeqNo(detail.getFdSerialNumber());
//预约日期 //预约日期
......
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