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,7 +1429,8 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -1424,7 +1429,8 @@ 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())) {
detailData = oldMap.get(data.getUniBusiId());
if (detailData != null) { if (detailData != null) {
// 收款人名称 // 收款人名称
logDetail.setFdPayee(detailData.getFdPayeeName()); logDetail.setFdPayee(detailData.getFdPayeeName());
...@@ -1447,6 +1453,7 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -1447,6 +1453,7 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
} }
detailDataList.add(detailData); detailDataList.add(detailData);
} }
}
logDetailList.add(logDetail); logDetailList.add(logDetail);
} }
ekpBankGrantLogDetailService.saveBatch(logDetailList); ekpBankGrantLogDetailService.saveBatch(logDetailList);
......
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