Skip to content

Y
yd-csf
Commit 37e3791f by jianan
Options

前端对接问题修复14

parent bc6afc23
Showing with 13 additions and 11 deletions
yd-csf-api/src/main/java/com/yd/csf/api/controller/ApiCommissionController.java
...@@ -528,8 +528,8 @@ public class ApiCommissionController { ...@@ -528,8 +528,8 @@ public class ApiCommissionController {
@Operation(summary = "入账记录") @Operation(summary = "入账记录")
public Result<Page<CommissionVO>> pageByCommissionexpectedBizId(@RequestBody CommissionQueryRequest commissionQueryRequest, public Result<Page<CommissionVO>> pageByCommissionexpectedBizId(@RequestBody CommissionQueryRequest commissionQueryRequest,
HttpServletRequest request) { HttpServletRequest request) {
if (ObjectUtils.isEmpty(commissionQueryRequest.getCommissionExpectedBizId())) { if (ObjectUtils.isEmpty(commissionQueryRequest.getCommissionExpectedBizId()) && ObjectUtils.isEmpty(commissionQueryRequest.getReconciliationYearMonth())) {
return Result.fail(ResultCode.PARAMS_ERROR.getCode(), "commissionExpectedBizId 不能为空"); return Result.fail(ResultCode.PARAMS_ERROR.getCode(), "commissionExpectedBizId、 reconciliationYearMonth 不能全部为空");
} }
long current = commissionQueryRequest.getPageNo(); long current = commissionQueryRequest.getPageNo();
...@@ -537,6 +537,7 @@ public class ApiCommissionController { ...@@ -537,6 +537,7 @@ public class ApiCommissionController {
// 查询列表数据 // 查询列表数据
QueryWrapper<Commission> queryWrapper = new QueryWrapper<>(); QueryWrapper<Commission> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("commission_expected_biz_id", commissionQueryRequest.getCommissionExpectedBizId()); queryWrapper.eq("commission_expected_biz_id", commissionQueryRequest.getCommissionExpectedBizId());
queryWrapper.eq("reconciliation_year_month", commissionQueryRequest.getReconciliationYearMonth());
Page<Commission> commissionPage = commissionService.page(new Page<>(current, size), Page<Commission> commissionPage = commissionService.page(new Page<>(current, size),
queryWrapper); queryWrapper);
// 组装返回值 // 组装返回值
......
yd-csf-service/src/main/java/com/yd/csf/service/service/impl/CommissionServiceImpl.java
...@@ -686,10 +686,9 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss ...@@ -686,10 +686,9 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
throw new BusinessException(ResultCode.PARAMS_ERROR.getCode(), "来佣数据不能为空"); throw new BusinessException(ResultCode.PARAMS_ERROR.getCode(), "来佣数据不能为空");
} }
Set<String> policyNoSet = customerAddRequestList.stream().map(CommissionAddRequest::getPolicyNo).collect(Collectors.toSet()); Set<String> policyNoSet = customerAddRequestList.stream().map(CommissionAddRequest::getPolicyNo).collect(Collectors.toSet());
// 校验来佣所属保单是否存在
List<PolicyFollow> policyFollowList = policyFollowService.list(new QueryWrapper<PolicyFollow>().in("policy_no", policyNoSet));
// 校验来佣所属保单跟进是否存在 // 校验来佣所属保单跟进是否存在
if (!CollectionUtils.isEmpty(policyFollowList)) { List<PolicyFollow> policyFollowList = policyFollowService.list(new QueryWrapper<PolicyFollow>().in("policy_no", policyNoSet));
if (!CollectionUtils.isEmpty(policyNoSet)) {
// 保单号映射 // 保单号映射
Map<String, PolicyFollow> policyFollowMap = policyFollowList.stream().collect(Collectors.toMap(PolicyFollow::getPolicyNo, Function.identity())); Map<String, PolicyFollow> policyFollowMap = policyFollowList.stream().collect(Collectors.toMap(PolicyFollow::getPolicyNo, Function.identity()));
for (CommissionAddRequest commissionAddRequest : customerAddRequestList) { for (CommissionAddRequest commissionAddRequest : customerAddRequestList) {
...@@ -710,12 +709,14 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss ...@@ -710,12 +709,14 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
commission.setCommissionBizId(RandomStringGenerator.generateBizId16(CommonEnum.UID_TYPE_COMMISSION.getCode())); commission.setCommissionBizId(RandomStringGenerator.generateBizId16(CommonEnum.UID_TYPE_COMMISSION.getCode()));
PolicyFollow policyFollow = policyFollowMap.get(request.getPolicyNo()); PolicyFollow policyFollow = policyFollowMap.get(request.getPolicyNo());
// 关联业务id if (policyFollow != null) {
commission.setReconciliationCompany(policyFollow.getReconciliationCompany()); // 关联业务id
commission.setReconciliationCompanyBizId(policyFollow.getReconciliationCompanyBizId()); commission.setReconciliationCompany(policyFollow.getReconciliationCompany());
commission.setProductLaunchBizId(policyFollow.getProductLaunchBizId()); commission.setReconciliationCompanyBizId(policyFollow.getReconciliationCompanyBizId());
commission.setInsuranceCompanyBizId(policyFollow.getInsuranceCompanyBizId()); commission.setProductLaunchBizId(policyFollow.getProductLaunchBizId());
commission.setPremium(Convert.toStr(policyFollow.getPaymentPremium())); commission.setInsuranceCompanyBizId(policyFollow.getInsuranceCompanyBizId());
commission.setPremium(Convert.toStr(policyFollow.getPaymentPremium()));
}
commissionList.add(commission); commissionList.add(commission);
} }
boolean b = this.saveOrUpdateBatch(commissionList); boolean b = this.saveOrUpdateBatch(commissionList);
......
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