Commit d8c50804 authored by hongguangwu's avatar hongguangwu

1.7.21-非扣税查询接口返回值对应(线上)

parent 34ce1e3c
...@@ -1399,9 +1399,14 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -1399,9 +1399,14 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
oldDetailList = ekpBankGrantDetailService.getListByParentId(vo.getFdId()); oldDetailList = ekpBankGrantDetailService.getListByParentId(vo.getFdId());
oldMap = new HashMap<>(); oldMap = new HashMap<>();
if (oldDetailList != null && !oldDetailList.isEmpty()) { if (oldDetailList != null && !oldDetailList.isEmpty()) {
String fdId;
for (EkpBankGrantDetail temp : oldDetailList) { for (EkpBankGrantDetail temp : oldDetailList) {
// oldMap.put temp.getFdSerialNumber(), temp) // oldMap.put temp.getFdSerialNumber(), temp)
oldMap.put(temp.getFdSerialNumber(), temp); fdId = temp.getFdId();
if (Common.isNotNull(fdId) && fdId.length()>35) {
fdId = fdId.substring(0, 35);
}
oldMap.put(fdId, temp);
} }
} }
moneyAll = BigDecimal.ZERO; moneyAll = BigDecimal.ZERO;
...@@ -1424,28 +1429,30 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -1424,28 +1429,30 @@ 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.getiSeqno()); if (Common.isNotNull(data.getUniBusiId())) {
if (detailData != null) { detailData = oldMap.get(data.getUniBusiId());
// 收款人名称 if (detailData != null) {
logDetail.setFdPayee(detailData.getFdPayeeName()); // 收款人名称
// 收款银行 logDetail.setFdPayee(detailData.getFdPayeeName());
logDetail.setFdRecipientBank(detailData.getFdRecipientBank()); // 收款银行
if ("7".equals(data.getResult())) { logDetail.setFdRecipientBank(detailData.getFdRecipientBank());
moneySuccess = BigDecimalUtils.safeAdd(moneySuccess, money); if ("7".equals(data.getResult())) {
numSuccess++; moneySuccess = BigDecimalUtils.safeAdd(moneySuccess, money);
detailData.setFdGrantStatus("发放成功"); numSuccess++;
} else { detailData.setFdGrantStatus("发放成功");
moneyFail = BigDecimalUtils.safeAdd(moneyFail, money); } else {
numFail++; moneyFail = BigDecimalUtils.safeAdd(moneyFail, money);
detailData.setFdGrantStatus("发放失败"); numFail++;
detailData.setFdHandleStatus(""); detailData.setFdGrantStatus("发放失败");
statusRemark = NO_TAX_STATUS_MAP.get(data.getResult()); detailData.setFdHandleStatus("");
detailData.setFdFailureFeedback(statusRemark); statusRemark = NO_TAX_STATUS_MAP.get(data.getResult());
// 批量更新中信银行表数据,使发放失败处理有数据出现 detailData.setFdFailureFeedback(statusRemark);
ekpBankGrantDetailService.updateZhongXinStatus(detailData.getFdSalaryId(), detailData.getFdId(), statusRemark); // 批量更新中信银行表数据,使发放失败处理有数据出现
ekpBankGrantDetailService.updateZhongXinMainStatus(detailData.getFdSalaryId(), detailData.getFdId(), statusRemark); ekpBankGrantDetailService.updateZhongXinStatus(detailData.getFdSalaryId(), detailData.getFdId(), statusRemark);
ekpBankGrantDetailService.updateZhongXinMainStatus(detailData.getFdSalaryId(), detailData.getFdId(), statusRemark);
}
detailDataList.add(detailData);
} }
detailDataList.add(detailData);
} }
logDetailList.add(logDetail); logDetailList.add(logDetail);
} }
......
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