Commit 68c9bc03 authored by fangxinjiang's avatar fangxinjiang

Merge remote-tracking branch 'origin/MVP1.7.20' into MVP1.7.20

parents d7425f90 3687fb1f
...@@ -61,7 +61,7 @@ public interface IcbcTransactionFlowQueryService extends IService<EkpSocialInfo> ...@@ -61,7 +61,7 @@ public interface IcbcTransactionFlowQueryService extends IService<EkpSocialInfo>
// 工行非税支付 // 工行非税支付
// type 0 对公; 1 对私. // type 0 对公; 1 对私.
R<String> submitIcbcToNoTax(String totalAmt, String totalCount, String wxNo R<String> submitIcbcToNoTax(String totalAmt, String totalCount, String wxNo
, List<EkpBankExcelNoTaxVo> detailList, int type, String fdId); , List<EkpBankExcelNoTaxVo> detailList, int type, String fdId, String packageName);
R submitSearch(); R submitSearch();
......
...@@ -918,6 +918,7 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -918,6 +918,7 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
redisUtil.set(redisKey, 600L); redisUtil.set(redisKey, 600L);
} }
try { try {
String packageName;
// 获取配置的行号 // 获取配置的行号
Map<String, EkpBankCodeConfiglVo> bankMap = ekpBankGrantDetailService.getEkpBankCodeConfiglVo(); Map<String, EkpBankCodeConfiglVo> bankMap = ekpBankGrantDetailService.getEkpBankCodeConfiglVo();
// 1主表 // 1主表
...@@ -960,7 +961,12 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -960,7 +961,12 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
if (Common.isNotNull(main.getFdDownloadNum()) && 11 == main.getFdDownloadNum()) { if (Common.isNotNull(main.getFdDownloadNum()) && 11 == main.getFdDownloadNum()) {
noTaxPayType = CommonConstants.ONE_INT; noTaxPayType = CommonConstants.ONE_INT;
} }
R<String> returnR = icbcTransactionFlowQueryService.submitIcbcToNoTax(totalAmt, totalCount, wxNo, detailList, noTaxPayType, fdId); packageName = "";
if (Common.isNotNull(main.getFdSettlementNo())) {
packageName = main.getFdSettlementNo() + CommonConstants.DOWN_LINE_STRING ;
}
packageName += DateUtil.getThisTime();
R<String> returnR = icbcTransactionFlowQueryService.submitIcbcToNoTax(totalAmt, totalCount, wxNo, detailList, noTaxPayType, fdId, packageName);
if (returnR.getCode() == CommonConstants.SUCCESS) { if (returnR.getCode() == CommonConstants.SUCCESS) {
String serialNo = returnR.getData(); String serialNo = returnR.getData();
// 存储日志 // 存储日志
...@@ -1009,13 +1015,22 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -1009,13 +1015,22 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
detail.setFdWxNo(wxNo); detail.setFdWxNo(wxNo);
ekpBankGrantDetailService.updateById(detail); ekpBankGrantDetailService.updateById(detail);
} }
packageName = "";
if (Common.isNotNull(detail.getFdParentId())) {
EkpBankPayTask main = ekpBankPayTaskService.getById(detail.getFdParentId());
if (main != null && Common.isNotNull(main.getFdSettlementNo())) {
packageName = main.getFdSettlementNo() + CommonConstants.DOWN_LINE_STRING ;
}
}
packageName += DateUtil.getThisTime();
// 0对公1对私 // 0对公1对私
int noTaxPayType = CommonConstants.ZERO_INT; int noTaxPayType = CommonConstants.ZERO_INT;
if (Common.isNotNull(detail.getFdDownloadNum()) && 11 == detail.getFdDownloadNum()) { if (Common.isNotNull(detail.getFdDownloadNum()) && 11 == detail.getFdDownloadNum()) {
noTaxPayType = CommonConstants.ONE_INT; noTaxPayType = CommonConstants.ONE_INT;
} }
List<EkpBankExcelNoTaxVo> detailList = ekpBankGrantDetailService.getEkpBankExcelVoByIdAndDetailNoTax(fdId); List<EkpBankExcelNoTaxVo> detailList = ekpBankGrantDetailService.getEkpBankExcelVoByIdAndDetailNoTax(fdId);
R<String> returnR = icbcTransactionFlowQueryService.submitIcbcToNoTax(totalAmt, totalCount, wxNo, detailList, noTaxPayType, fdId); R<String> returnR = icbcTransactionFlowQueryService.submitIcbcToNoTax(totalAmt, totalCount, wxNo, detailList, noTaxPayType, fdId, packageName);
if (returnR.getCode() == CommonConstants.SUCCESS) { if (returnR.getCode() == CommonConstants.SUCCESS) {
String serialNo = returnR.getData(); String serialNo = returnR.getData();
// 存储日志 // 存储日志
......
...@@ -844,7 +844,7 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -844,7 +844,7 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
// 改造自上面的demo接口:executePayment // 改造自上面的demo接口:executePayment
// type 0 对公; 1 对私. // type 0 对公; 1 对私.
public R<String> submitIcbcToNoTax(String totalAmt, String totalCount, String wxNo public R<String> submitIcbcToNoTax(String totalAmt, String totalCount, String wxNo
, List<EkpBankExcelNoTaxVo> detailList, int type, String fdId) { , List<EkpBankExcelNoTaxVo> detailList, int type, String fdId, String packageName) {
// 获取当前时间 // 获取当前时间
LocalTime currentTime = LocalTime.now(); LocalTime currentTime = LocalTime.now();
// 使用DateTimeFormatter格式化 // 使用DateTimeFormatter格式化
...@@ -879,7 +879,7 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -879,7 +879,7 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
//报文压缩内容:zip算法压缩rd区后再BASE64编码,约定取第一个文件 //报文压缩内容:zip算法压缩rd区后再BASE64编码,约定取第一个文件
bizContent.setZip(""); bizContent.setZip("");
//批量包名称,使用非扣税单号 //批量包名称,使用非扣税单号
bizContent.setPackageName(wxNo); bizContent.setPackageName(packageName);
List<MybankEnterprisePayPayentRequestV2.MybankEnterprisePayPayentRequestRdV2> rd = new ArrayList<>(); List<MybankEnterprisePayPayentRequestV2.MybankEnterprisePayPayentRequestRdV2> rd = new ArrayList<>();
MybankEnterprisePayPayentRequestV2.MybankEnterprisePayPayentRequestRdV2 rdDetail; MybankEnterprisePayPayentRequestV2.MybankEnterprisePayPayentRequestRdV2 rdDetail;
......
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