Skip to content

Y
yd-csf
Commit 2ca33ebb by zhangxingmin
Options

push

parent 4e597b79
Showing with 40 additions and 36 deletions
yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiExpectedFortuneServiceImpl.java
......@@ -224,28 +224,47 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
// throw new BusinessException("绑定基本法数据不存在");
// }
//查询产品发佣配置，获取结算币种
QueryPolicyAndBrokerDto queryPolicyAndBrokerDto = queryPolicyAndBrokerDtoList.get(0);
ApiAnnouncementCommissionRatioListRequest announcementRatioListRequest = new ApiAnnouncementCommissionRatioListRequest();
announcementRatioListRequest.setProductLaunchBizId(queryPolicyAndBrokerDto.getPlanBizId());
announcementRatioListRequest.setEffectiveDate(Date.from(queryPolicyAndBrokerDto.getEffectiveDate().atStartOfDay(ZoneId.systemDefault()).toInstant()));
announcementRatioListRequest.setPaymentTerm(String.valueOf(queryPolicyAndBrokerDto.getPaymentTerm()));
HttpServletRequest request1 = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
String token = request1.getHeader("Authorization");
log.info("HttpServletRequest token==============,{}",token);
List<ApiAnnouncementCommissionRatioListResponse> announcementRatioList;
Integer paymentTerm = 0;
List<ApiAnnouncementCommissionRatioListResponse> announcementRatioList = new ArrayList<>();
Result<List<ApiAnnouncementCommissionRatioListResponse>> listResult = apiCommissionConditionService.getCommissionRatioList(request.getPolicyNo());
if (listResult != null && !CollectionUtils.isEmpty(listResult.getData())) {
announcementRatioList = listResult.getData();
//取 endPeriod 的最大值作为总期数
paymentTerm = listResult.getData().stream()
.map(item -> {
try {
announcementRatioList = feignResultHelper.extractListData(
apiAnnouncementCommissionRatioFeignClient.list(announcementRatioListRequest),
ApiAnnouncementCommissionRatioListResponse.class
);
} catch (Exception e) {
log.info("查询结算币种->保单号:{}，入参request：{}", request.getPolicyNo(), JSON.toJSONString(announcementRatioListRequest));
throw new BusinessException("未查询到产品发佣配置，查询条件：" + JSON.toJSONString(announcementRatioListRequest));
return Integer.parseInt(item.getEndPeriod());
} catch (NumberFormatException e) {
log.warn("endPeriod 格式错误: {}", item.getEndPeriod());
return 0;
}
})
.max(Integer::compareTo)
.orElse(0);
}
log.info("查询产品发佣配置，获取结算币种==========>，{}",JSON.toJSONString(announcementRatioList));
//查询产品发佣配置，获取结算币种
// QueryPolicyAndBrokerDto queryPolicyAndBrokerDto = queryPolicyAndBrokerDtoList.get(0);
// ApiAnnouncementCommissionRatioListRequest announcementRatioListRequest = new ApiAnnouncementCommissionRatioListRequest();
// announcementRatioListRequest.setProductLaunchBizId(queryPolicyAndBrokerDto.getPlanBizId());
// announcementRatioListRequest.setEffectiveDate(Date.from(queryPolicyAndBrokerDto.getEffectiveDate().atStartOfDay(ZoneId.systemDefault()).toInstant()));
// announcementRatioListRequest.setPaymentTerm(String.valueOf(queryPolicyAndBrokerDto.getPaymentTerm()));
//
// HttpServletRequest request1 = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
// String token = request1.getHeader("Authorization");
// log.info("HttpServletRequest token==============,{}",token);
// List<ApiAnnouncementCommissionRatioListResponse> announcementRatioList;
// try {
// announcementRatioList = feignResultHelper.extractListData(
// apiAnnouncementCommissionRatioFeignClient.list(announcementRatioListRequest),
// ApiAnnouncementCommissionRatioListResponse.class
// );
// } catch (Exception e) {
// log.info("查询结算币种->保单号:{}，入参request：{}", request.getPolicyNo(), JSON.toJSONString(announcementRatioListRequest));
// throw new BusinessException("未查询到产品发佣配置，查询条件：" + JSON.toJSONString(announcementRatioListRequest));
// }
// Integer paymentTerm = 0;
// PolicyFollow policyFollow = policyFollowService.queryOneByPolicyNo(request.getPolicyNo());
......@@ -273,23 +292,8 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
// }
Integer paymentTerm = 0;
Result<List<ApiAnnouncementCommissionRatioListResponse>> listResult = apiCommissionConditionService.getCommissionRatioList(request.getPolicyNo());
if (listResult != null && !CollectionUtils.isEmpty(listResult.getData())) {
// 取 endPeriod 的最大值作为总期数
paymentTerm = listResult.getData().stream()
.map(item -> {
try {
return Integer.parseInt(item.getEndPeriod()); // 将字符串转为整数
} catch (NumberFormatException e) {
// 若转换失败，记录日志并返回0，避免影响最大值计算
log.warn("endPeriod 格式错误: {}", item.getEndPeriod());
return 0;
}
})
.max(Integer::compareTo)
.orElse(0); // 若无有效值，默认0
}
//遍历保单转介人列表信息 -> 调用基本法算出预计发佣列表（同步执行）
......
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