Commit 31402687 authored by hongguangwu's avatar hongguangwu

1.7.23-其他银企

parent 1e138bff
...@@ -1012,6 +1012,21 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -1012,6 +1012,21 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
tableName = "ekp_436a2f7398af04d6a875"; tableName = "ekp_436a2f7398af04d6a875";
} }
title = main.getFdAttaName(); title = main.getFdAttaName();
} else if ("其他".equals(main.getFdPayType())) {
if ("退款申请单".equals(main.getFdAttaName())) {
wxNoPre = "TKSQ";
tableName = "ekp_d8530408dca4b94b9a8f";
} else if ("个人代扣代缴".equals(main.getFdAttaName())) {
wxNoPre = "GRDKZC";
tableName = "ekp_8a0c895704b114104898";
} else if ("单位代扣代缴".equals(main.getFdAttaName())) {
wxNoPre = "DWDKZC";
tableName = "ekp_9919bc82b334d38bfe43";
} else if ("特殊事件".equals(main.getFdAttaName())) {
wxNoPre = "TSSJZC";
tableName = "ekp_9cbf48fc1614c46835ef";
}
title = main.getFdAttaName();
} }
} }
int count = ekpBankGrantDetailService.getCountByIdAndMain(fdId); int count = ekpBankGrantDetailService.getCountByIdAndMain(fdId);
...@@ -1127,6 +1142,17 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -1127,6 +1142,17 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
wxNoPre = "YWZCF"; wxNoPre = "YWZCF";
} }
title = main.getFdAttaName(); title = main.getFdAttaName();
} else if ("其他".equals(main.getFdPayType())) {
if ("退款申请单".equals(main.getFdAttaName())) {
wxNoPre = "TKSQ";
} else if ("个人代扣代缴".equals(main.getFdAttaName())) {
wxNoPre = "GRDKZC";
} else if ("单位代扣代缴".equals(main.getFdAttaName())) {
wxNoPre = "DWDKZC";
} else if ("特殊事件".equals(main.getFdAttaName())) {
wxNoPre = "TSSJZC";
}
title = main.getFdAttaName();
} }
} }
} }
...@@ -1486,6 +1512,8 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -1486,6 +1512,8 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
String failStatus = "41"; String failStatus = "41";
String fdPayTypeFks = "非扣税"; String fdPayTypeFks = "非扣税";
String fdPayTypeFksDefailt = "转账"; String fdPayTypeFksDefailt = "转账";
String fdPayTypeOther = "其他";
String fdPayTypeOtherDefailt = "其他支出";
int i = 0; int i = 0;
if (mainList != null && !mainList.isEmpty()) { if (mainList != null && !mainList.isEmpty()) {
EkpBankPayTask main; EkpBankPayTask main;
...@@ -1496,16 +1524,7 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -1496,16 +1524,7 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
// 是否经过了检查,经过检查后则不继续检查结果 // 是否经过了检查,经过检查后则不继续检查结果
boolean isShouQuanCheck = true; boolean isShouQuanCheck = true;
for (EkpBankResultVo vo : mainList) { for (EkpBankResultVo vo : mainList) {
title = getTitle(fdPayTypeFks, fdPayTypeFksDefailt, fdPayTypeOther, fdPayTypeOtherDefailt, vo);
if (Common.isNotNull(vo.getFdPayType())) {
if (fdPayTypeFks.equals(vo.getFdPayType())) {
title = fdPayTypeFksDefailt;
} else {
title = vo.getFdPayType();
}
} else {
title = fdPayTypeFksDefailt;
}
seqNo = seqNoPre + System.currentTimeMillis() + (i++); seqNo = seqNoPre + System.currentTimeMillis() + (i++);
responseV1 = icbcTransactionFlowQueryService.getResultNoTax(vo, tranDate, tranTime, seqNo, client); responseV1 = icbcTransactionFlowQueryService.getResultNoTax(vo, tranDate, tranTime, seqNo, client);
if (Common.isNotNull(responseV1)) { if (Common.isNotNull(responseV1)) {
...@@ -1652,15 +1671,8 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -1652,15 +1671,8 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
// 初始化 // 初始化
i = 0; i = 0;
for (EkpBankResultVo vo : detailList) { for (EkpBankResultVo vo : detailList) {
if (Common.isNotNull(vo.getFdPayType())) {
if (fdPayTypeFks.equals(vo.getFdPayType())) { title = getTitle(fdPayTypeFks, fdPayTypeFksDefailt, fdPayTypeOther, fdPayTypeOtherDefailt, vo);
title = fdPayTypeFksDefailt;
} else {
title = vo.getFdPayType();
}
} else {
title = fdPayTypeFksDefailt;
}
seqNo = seqNoPre + System.currentTimeMillis() + (i++); seqNo = seqNoPre + System.currentTimeMillis() + (i++);
responseV1 = icbcTransactionFlowQueryService.getResultNoTax(vo, tranDate, tranTime, seqNo, client); responseV1 = icbcTransactionFlowQueryService.getResultNoTax(vo, tranDate, tranTime, seqNo, client);
...@@ -1775,6 +1787,22 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -1775,6 +1787,22 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
return R.ok(); return R.ok();
} }
private String getTitle(String fdPayTypeFks, String fdPayTypeFksDefailt, String fdPayTypeOther, String fdPayTypeOtherDefailt, EkpBankResultVo vo) {
String title;
if (Common.isNotNull(vo.getFdPayType())) {
if (fdPayTypeFks.equals(vo.getFdPayType())) {
title = fdPayTypeFksDefailt;
} else if (fdPayTypeOther.equals(vo.getFdPayType())) {
title = fdPayTypeOtherDefailt;
} else {
title = vo.getFdPayType();
}
} else {
title = fdPayTypeFksDefailt;
}
return title;
}
/** /**
* 重写获取PDF文件的方法 * 重写获取PDF文件的方法
* 该方法通过SFTP协议从工商银行的服务器下载PDF文件 * 该方法通过SFTP协议从工商银行的服务器下载PDF文件
......
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