Skip to content

Y
yd-csf
Commit dc3fd6ff by jianan
Options

前端对接问题修复85

parent 225cb71a
Showing with 24 additions and 8 deletions
yd-csf-service/src/main/java/com/yd/csf/service/component/CommissionAsyncService.java
...@@ -39,7 +39,7 @@ public class CommissionAsyncService { ...@@ -39,7 +39,7 @@ public class CommissionAsyncService {
@Resource @Resource
private CommissionCompareRecordService commissionCompareRecordService; private CommissionCompareRecordService commissionCompareRecordService;
// @Async("commonAsyncExecutor") // @Async("commonAsyncExecutor")
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void commissionCompareBatch(List<Commission> entities) { public void commissionCompareBatch(List<Commission> entities) {
// 根据是否关联保单号，来区分比对方式 // 根据是否关联保单号，来区分比对方式
...@@ -62,6 +62,7 @@ public class CommissionAsyncService { ...@@ -62,6 +62,7 @@ public class CommissionAsyncService {
/** /**
* 无保单号的来佣比对 * 无保单号的来佣比对
*
* @param noPolicyNoList * @param noPolicyNoList
*/ */
private void noPolicyNoBatch(List<Commission> noPolicyNoList) { private void noPolicyNoBatch(List<Commission> noPolicyNoList) {
...@@ -69,6 +70,9 @@ public class CommissionAsyncService { ...@@ -69,6 +70,9 @@ public class CommissionAsyncService {
List<String> receivableNoList = noPolicyNoList.stream() List<String> receivableNoList = noPolicyNoList.stream()
.map(Commission::getReceivableNo) .map(Commission::getReceivableNo)
.collect(Collectors.toList()); .collect(Collectors.toList());
if (CollectionUtils.isEmpty(receivableNoList)) {
throw new BusinessException(ResultCode.FAIL.getCode(), "非关联保单号应收单，应收款编号不能为空");
}
// 2.根据应收款编号查询预计来佣 // 2.根据应收款编号查询预计来佣
List<CommissionExpected> expectedList = commissionExpectedService.lambdaQuery() List<CommissionExpected> expectedList = commissionExpectedService.lambdaQuery()
.in(CommissionExpected::getReceivableNo, receivableNoList) .in(CommissionExpected::getReceivableNo, receivableNoList)
......
yd-csf-service/src/main/java/com/yd/csf/service/service/impl/CommissionServiceImpl.java
...@@ -746,8 +746,6 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss ...@@ -746,8 +746,6 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
List<Policy> policyList = policyService.lambdaQuery().in(Policy::getPolicyNo, policyNoSet).list(); List<Policy> policyList = policyService.lambdaQuery().in(Policy::getPolicyNo, policyNoSet).list();
// 保单映射 // 保单映射
policyMap = policyList.stream().collect(Collectors.toMap(Policy::getPolicyNo, Function.identity())); policyMap = policyList.stream().collect(Collectors.toMap(Policy::getPolicyNo, Function.identity()));
// 查询预计入账信息
commissionExpectedList = commissionExpectedService.lambdaQuery().in(CommissionExpected::getPolicyNo, policyNoSet).list();
} }
List<Commission> commissionList = new ArrayList<>(); List<Commission> commissionList = new ArrayList<>();
...@@ -780,7 +778,7 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss ...@@ -780,7 +778,7 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
commission.setPolicyNo(null); commission.setPolicyNo(null);
} }
// 关联预计来佣信息 // 关联预计来佣信息
getCommissionExpectedBizIdBatch(request, commissionExpectedList, commission); getCommissionExpectedBizIdBatch(request, policyNoSet, commission);
commissionList.add(commission); commissionList.add(commission);
} }
...@@ -805,10 +803,15 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss ...@@ -805,10 +803,15 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
return commissionList; return commissionList;
} }
private static void getCommissionExpectedBizIdBatch(CommissionAddRequest request, List<CommissionExpected> commissionExpectedList, Commission commission) { private void getCommissionExpectedBizIdBatch(CommissionAddRequest request, Set<String> policyNoSet, Commission commission) {
if (CollectionUtils.isNotEmpty(commissionExpectedList)) { CommissionExpected expected = null;
CommissionExpected expected;
if ("R".equals(request.getCommissionBizType())) { if ("R".equals(request.getCommissionBizType())) {
// 查询预计入账信息
List<CommissionExpected> commissionExpectedList = new ArrayList<>();
if (CollUtil.isNotEmpty(policyNoSet)) {
commissionExpectedList = commissionExpectedService.lambdaQuery().in(CommissionExpected::getPolicyNo, policyNoSet).list();
}
if (CollectionUtils.isNotEmpty(commissionExpectedList)) {
// 根据保单号、期数、入账名称，查询预计来佣记录 // 根据保单号、期数、入账名称，查询预计来佣记录
expected = commissionExpectedList.stream() expected = commissionExpectedList.stream()
.filter(item -> item.getPolicyNo().equals(request.getPolicyNo()) .filter(item -> item.getPolicyNo().equals(request.getPolicyNo())
...@@ -817,7 +820,16 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss ...@@ -817,7 +820,16 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
&& item.getCommissionName().equals(request.getCommissionName())) && item.getCommissionName().equals(request.getCommissionName()))
.findFirst() .findFirst()
.orElse(null); .orElse(null);
}
} else { } else {
// 查询预计来佣信息
List<CommissionExpected> commissionExpectedList = commissionExpectedService.lambdaQuery()
.eq(CommissionExpected::getReconciliationCompanyBizId, request.getReconciliationCompanyBizId())
.eq(CommissionExpected::getCommissionBizType, request.getCommissionBizType())
.eq(CommissionExpected::getCommissionName, request.getCommissionName())
.list();
if (CollectionUtils.isNotEmpty(commissionExpectedList)) {
expected = commissionExpectedList.stream() expected = commissionExpectedList.stream()
.filter(item -> item.getReconciliationCompanyBizId().equals(request.getReconciliationCompanyBizId()) .filter(item -> item.getReconciliationCompanyBizId().equals(request.getReconciliationCompanyBizId())
&& item.getCommissionName().equals(request.getCommissionName()) && item.getCommissionName().equals(request.getCommissionName())
...@@ -825,6 +837,7 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss ...@@ -825,6 +837,7 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
.findFirst() .findFirst()
.orElse(null); .orElse(null);
} }
}
if (expected != null) { if (expected != null) {
commission.setCommissionExpectedBizId(expected.getCommissionExpectedBizId()); commission.setCommissionExpectedBizId(expected.getCommissionExpectedBizId());
commission.setReceivableNo(expected.getReceivableNo()); commission.setReceivableNo(expected.getReceivableNo());
...@@ -834,7 +847,6 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss ...@@ -834,7 +847,6 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
commission.setStatus(CommissionStatusEnum.MATCH_FAILED.getItemValue()); commission.setStatus(CommissionStatusEnum.MATCH_FAILED.getItemValue());
} }
} }
}
private void validateAddCommissionBatch(List<CommissionAddRequest> customerAddRequestList) { private void validateAddCommissionBatch(List<CommissionAddRequest> customerAddRequestList) {
for (CommissionAddRequest request : customerAddRequestList) { for (CommissionAddRequest request : customerAddRequestList) {
......
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