Commit 2739f374 authored by hongguangwu's avatar hongguangwu

1.7.20-非扣税银企

parent 20ea9b8c
...@@ -1348,7 +1348,7 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -1348,7 +1348,7 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
if (oldDetailList != null && !oldDetailList.isEmpty()) { if (oldDetailList != null && !oldDetailList.isEmpty()) {
for (EkpBankGrantDetail temp : oldDetailList) { for (EkpBankGrantDetail temp : oldDetailList) {
// oldMap.put temp.getFdSerialNumber(), temp) // oldMap.put temp.getFdSerialNumber(), temp)
oldMap.put(temp.getFdId(), temp); oldMap.put(temp.getFdSerialNumber(), temp);
} }
} }
moneyAll = BigDecimal.ZERO; moneyAll = BigDecimal.ZERO;
...@@ -1371,7 +1371,7 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -1371,7 +1371,7 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
logDetail = new EkpBankGrantLogDetail(); logDetail = new EkpBankGrantLogDetail();
setLogDetailBaseInfoNoTax(logs, money, logDetail, data); setLogDetailBaseInfoNoTax(logs, money, logDetail, data);
detailData = oldMap.get(data.getErpSqn()); detailData = oldMap.get(data.getiSeqno());
if (detailData != null) { if (detailData != null) {
// 收款人名称 // 收款人名称
logDetail.setFdPayee(detailData.getFdPayeeName()); logDetail.setFdPayee(detailData.getFdPayeeName());
...@@ -1463,7 +1463,7 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -1463,7 +1463,7 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
money = BigDecimalUtils.safeDivide(new BigDecimal(data.getPayAmt()), new BigDecimal("100"), 2); money = BigDecimalUtils.safeDivide(new BigDecimal(data.getPayAmt()), new BigDecimal("100"), 2);
detailData = new EkpBankGrantDetail(); detailData = new EkpBankGrantDetail();
detailData.setFdId(vo.getFdId()); detailData.setFdId(vo.getFdId());
detailData.setFdSerialNumber(data.getErpSqn()); detailData.setFdSerialNumber(data.getiSeqno());
// 生成日志主表 // 生成日志主表
logs = new EkpBankGrantLog(); logs = new EkpBankGrantLog();
...@@ -1516,7 +1516,6 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -1516,7 +1516,6 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
money = new BigDecimal(vo.getFdMoney()); money = new BigDecimal(vo.getFdMoney());
detailData = new EkpBankGrantDetail(); detailData = new EkpBankGrantDetail();
detailData.setFdId(vo.getFdId()); detailData.setFdId(vo.getFdId());
detailData.setFdSerialNumber("");
// 生成日志主表 // 生成日志主表
logs = new EkpBankGrantLog(); logs = new EkpBankGrantLog();
......
...@@ -953,10 +953,14 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -953,10 +953,14 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
MybankEnterprisePayPayentRequestV2.MybankEnterprisePayPayentRequestRdV2 payRecord = MybankEnterprisePayPayentRequestV2.MybankEnterprisePayPayentRequestRdV2 payRecord =
new MybankEnterprisePayPayentRequestV2.MybankEnterprisePayPayentRequestRdV2(); new MybankEnterprisePayPayentRequestV2.MybankEnterprisePayPayentRequestRdV2();
String fdId = detail.getFdId();
if (Common.isNotNull(fdId) && fdId.length()>35) {
fdId = fdId.substring(0, 35);
}
//业务唯一编号:相同指令不重复 //业务唯一编号:相同指令不重复
payRecord.setUniBusiId(generateUniBusiId()); payRecord.setUniBusiId(fdId);
//指令顺序号:每笔指令的序号,本包内不重复 //指令顺序号:每笔指令的序号,本包内不重复
payRecord.setiSeqNo(generateSeqNo()); payRecord.setiSeqNo(detail.getFdSerialNumber());
//预约日期 //预约日期
// payRecord.setScheduleDate("20251126"); // payRecord.setScheduleDate("20251126");
//对公对私标志:0:对公;1:个人 //对公对私标志:0:对公;1:个人
...@@ -1020,7 +1024,7 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -1020,7 +1024,7 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
//相关业务编号 //相关业务编号
// payRecord.setRelatedRefNo(record.getRelatedRefNo()); // payRecord.setRelatedRefNo(record.getRelatedRefNo());
//ERP流水号 //ERP流水号
payRecord.setErpSerialNo(detail.getFdId()); //payRecord.setErpSerialNo(detail.getFdId());
//ERP支票号 //ERP支票号
// payRecord.setErpCheckNo(record.getErpCheckNo()); // payRecord.setErpCheckNo(record.getErpCheckNo());
//业务代码 //业务代码
...@@ -1041,10 +1045,14 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -1041,10 +1045,14 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
private MybankEnterprisePayPayentRequestV2.MybankEnterprisePayPayentRequestRdV2 buildPayRecordDuiSi(EkpBankExcelNoTaxVo detail) { private MybankEnterprisePayPayentRequestV2.MybankEnterprisePayPayentRequestRdV2 buildPayRecordDuiSi(EkpBankExcelNoTaxVo detail) {
MybankEnterprisePayPayentRequestV2.MybankEnterprisePayPayentRequestRdV2 payRecord = MybankEnterprisePayPayentRequestV2.MybankEnterprisePayPayentRequestRdV2 payRecord =
new MybankEnterprisePayPayentRequestV2.MybankEnterprisePayPayentRequestRdV2(); new MybankEnterprisePayPayentRequestV2.MybankEnterprisePayPayentRequestRdV2();
String fdId = detail.getFdId();
if (Common.isNotNull(fdId) && fdId.length()>35) {
fdId = fdId.substring(0, 35);
}
//业务唯一编号:相同指令不重复 //业务唯一编号:相同指令不重复
payRecord.setUniBusiId(generateUniBusiId()); payRecord.setUniBusiId(fdId);
//指令顺序号:每笔指令的序号,本包内不重复 //指令顺序号:每笔指令的序号,本包内不重复
payRecord.setiSeqNo(generateSeqNo()); payRecord.setiSeqNo(detail.getFdSerialNumber());
//预约日期 //预约日期
// payRecord.setScheduleDate("20251126"); // payRecord.setScheduleDate("20251126");
//对公对私标志:0:对公;1:个人 //对公对私标志:0:对公;1:个人
...@@ -1090,7 +1098,8 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -1090,7 +1098,8 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
} else { } else {
payRecord.setPurpose("转账"); payRecord.setPurpose("转账");
} }
payRecord.setErpSerialNo(detail.getFdId()); // 超长了,20长度
//payRecord.setErpSerialNo(detail.getFdId());
//摘要 //摘要
//payRecord.setSummary("12"); //payRecord.setSummary("12");
return payRecord; return payRecord;
......
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