Skip to content

Y
yd-csf
Commit c5a47f61 by zhangxingmin
Options

Merge remote-tracking branch 'origin/test' into test

parents 0657bb31 755afe6a
Showing with 47 additions and 10 deletions
yd-csf-api/src/main/java/com/yd/csf/api/controller/ApiPolicyFollowController.java
...@@ -723,13 +723,13 @@ public class ApiPolicyFollowController { ...@@ -723,13 +723,13 @@ public class ApiPolicyFollowController {
/** /**
* 查询保单号列表 * 查询保单号列表
* *
* @param policyNo 保单号 * @param policyNosQueryRequest
* @return 保单号列表 * @return 保单号列表
*/ */
@GetMapping("/policyNos") @PostMapping("/policyNos")
@Operation(summary = "查询保单号列表") @Operation(summary = "查询保单号列表")
public Result<List<String>> queryPolicyNumbers(@RequestParam String policyNo) { public Result<List<String>> queryPolicyNumbers(@RequestBody PolicyNosQueryRequest policyNosQueryRequest) {
List<String> policyNumbers = policyFollowService.queryPolicyNumbers(policyNo); List<String> policyNumbers = policyFollowService.queryPolicyNumbers(policyNosQueryRequest.getPolicyNo());
return Result.success(policyNumbers); return Result.success(policyNumbers);
} }
} }
\ No newline at end of file
yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiAppointmentServiceImpl.java
...@@ -706,6 +706,7 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService { ...@@ -706,6 +706,7 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService {
// 产品类别（保险险种名称） // 产品类别（保险险种名称）
follow.setProductCate(apiProductPlanMainInfoDto.getInsuranceTypeName()); follow.setProductCate(apiProductPlanMainInfoDto.getInsuranceTypeName());
follow.setInsuranceCategoryBizId(apiProductPlanMainInfoDto.getInsuranceTypeId()); follow.setInsuranceCategoryBizId(apiProductPlanMainInfoDto.getInsuranceTypeId());
follow.setCategoryCode(productPlan.getInsuranceTypeCode());
// 保险公司 // 保险公司
follow.setInsuranceCompany(apiProductPlanMainInfoDto.getCompanyName()); follow.setInsuranceCompany(apiProductPlanMainInfoDto.getCompanyName());
// 保险公司业务ID（从产品计划获取的公司ID） // 保险公司业务ID（从产品计划获取的公司ID）
......
yd-csf-service/src/main/java/com/yd/csf/service/dto/BrokerData.java
...@@ -5,13 +5,16 @@ import lombok.Data; ...@@ -5,13 +5,16 @@ import lombok.Data;
@Data @Data
public class BrokerData { public class BrokerData {
@Schema(description = "介绍人姓名", requiredMode = Schema.RequiredMode.REQUIRED) @Schema(description = "转介人姓名", requiredMode = Schema.RequiredMode.REQUIRED)
private String brokerName; private String brokerName;
@Schema(description = "转介人业务id", requiredMode = Schema.RequiredMode.REQUIRED)
private String brokerBizId;
@Schema(description = "介绍人性别", requiredMode = Schema.RequiredMode.REQUIRED) @Schema(description = "转介人性别", requiredMode = Schema.RequiredMode.REQUIRED)
private String brokerGender; private String brokerGender;
@Schema(description = "介绍人内部编号") @Schema(description = "转介人内部编号")
private String brokerNumber; private String brokerNumber;
@Schema(description = "转介人所属团队", requiredMode = Schema.RequiredMode.REQUIRED) @Schema(description = "转介人所属团队", requiredMode = Schema.RequiredMode.REQUIRED)
......
yd-csf-service/src/main/java/com/yd/csf/service/dto/PolicyFollowDto.java
...@@ -137,6 +137,9 @@ public class PolicyFollowDto implements Serializable { ...@@ -137,6 +137,9 @@ public class PolicyFollowDto implements Serializable {
@Schema(description = "产品险种") @Schema(description = "产品险种")
private String productCate; private String productCate;
@Schema(description = "产品险种代码")
private String categoryCode;
@Schema(description = "产品险种业务id") @Schema(description = "产品险种业务id")
private String insuranceCategoryBizId; private String insuranceCategoryBizId;
......
yd-csf-service/src/main/java/com/yd/csf/service/dto/PolicyNosQueryRequest.java 0 → 100644
package com.yd.csf.service.dto;
import lombok.Data;
@Data
public class PolicyNosQueryRequest {
private String policyNo;
}
yd-csf-service/src/main/java/com/yd/csf/service/model/PolicyFollow.java
...@@ -216,6 +216,11 @@ public class PolicyFollow implements Serializable { ...@@ -216,6 +216,11 @@ public class PolicyFollow implements Serializable {
private String productCate; private String productCate;
/** /**
* 产品险种代码
*/
private String categoryCode;
/**
* 产品险种业务 id * 产品险种业务 id
*/ */
private String insuranceCategoryBizId; private String insuranceCategoryBizId;
......
yd-csf-service/src/main/java/com/yd/csf/service/service/impl/CommissionExpectedServiceImpl.java
...@@ -486,6 +486,10 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte ...@@ -486,6 +486,10 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
if (effectiveDate == null) { if (effectiveDate == null) {
throw new BusinessException("保单生效日期不能为空"); throw new BusinessException("保单生效日期不能为空");
} }
Object paymentTerm = policy.getPaymentTerm();
if (paymentTerm == null) {
throw new BusinessException("保单供款年期不能为空");
}
//查询redis缓存的字典列表信息 //查询redis缓存的字典列表信息
List<GetDictItemListByDictTypeResponse> dictTypeResponses = redisUtil.getCacheObject(RedisConstants.DICT_LIST); List<GetDictItemListByDictTypeResponse> dictTypeResponses = redisUtil.getCacheObject(RedisConstants.DICT_LIST);
...@@ -499,7 +503,12 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte ...@@ -499,7 +503,12 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
.max(Integer::compareTo) .max(Integer::compareTo)
.orElse(0); .orElse(0);
for (ApiExpectedSpeciesListResponse item : expectedSpeciesList) { // 根据供款年期匹配规格
List<ApiExpectedSpeciesListResponse> collect = expectedSpeciesList.stream()
.filter(i -> paymentTerm.equals(i.getPaymentTerm()))
.collect(Collectors.toList());
for (ApiExpectedSpeciesListResponse item : collect) {
CommissionExpected commissionExpected = new CommissionExpected(); CommissionExpected commissionExpected = new CommissionExpected();
commissionExpected.setCommissionExpectedBizId(RandomStringGenerator.generateBizId16("commission_expected")); commissionExpected.setCommissionExpectedBizId(RandomStringGenerator.generateBizId16("commission_expected"));
commissionExpected.setReceivableNo(receivableService.generateReceivableNo("R", reconciliationCompanyCode, reconciliationCompany)); commissionExpected.setReceivableNo(receivableService.generateReceivableNo("R", reconciliationCompanyCode, reconciliationCompany));
......
yd-csf-service/src/main/java/com/yd/csf/service/service/impl/PolicyFollowServiceImpl.java
...@@ -816,7 +816,7 @@ public class PolicyFollowServiceImpl extends ServiceImpl<PolicyFollowMapper, Pol ...@@ -816,7 +816,7 @@ public class PolicyFollowServiceImpl extends ServiceImpl<PolicyFollowMapper, Pol
@Override @Override
public List<String> queryPolicyNumbers(String policyNo) { public List<String> queryPolicyNumbers(String policyNo) {
QueryWrapper<PolicyFollow> queryWrapper = new QueryWrapper<>(); QueryWrapper<PolicyFollow> queryWrapper = new QueryWrapper<>();
queryWrapper.select("policyNo"); queryWrapper.select("policy_no");
queryWrapper.like(ObjectUtils.isNotEmpty(policyNo), "policy_no", policyNo); queryWrapper.like(ObjectUtils.isNotEmpty(policyNo), "policy_no", policyNo);
queryWrapper.isNotNull("policy_no"); queryWrapper.isNotNull("policy_no");
return policyFollowService.list(queryWrapper) return policyFollowService.list(queryWrapper)
......
yd-csf-service/src/main/java/com/yd/csf/service/vo/PolicyFollowDetailVO.java
...@@ -264,6 +264,12 @@ public class PolicyFollowDetailVO implements Serializable { ...@@ -264,6 +264,12 @@ public class PolicyFollowDetailVO implements Serializable {
private String productCate; private String productCate;
/** /**
* 产品险种代码
*/
@Schema(description = "产品险种代码")
private String categoryCode;
/**
* 产品险种业务id * 产品险种业务id
*/ */
@Schema(description = "产品险种业务id") @Schema(description = "产品险种业务id")
......
yd-csf-service/src/main/resources/mappers/PolicyFollowMapper.xml
...@@ -44,6 +44,7 @@ ...@@ -44,6 +44,7 @@
<result property="productLaunchBizId" column="product_launch_biz_id" /> <result property="productLaunchBizId" column="product_launch_biz_id" />
<result property="productName" column="product_name" /> <result property="productName" column="product_name" />
<result property="productCate" column="product_cate" /> <result property="productCate" column="product_cate" />
<result property="categoryCode" column="category_code" />
<result property="insuranceCategoryBizId" column="insurance_category_biz_id" /> <result property="insuranceCategoryBizId" column="insurance_category_biz_id" />
<result property="insuranceCompany" column="insurance_company" /> <result property="insuranceCompany" column="insurance_company" />
<result property="insuranceCompanyBizId" column="insurance_company_biz_id" /> <result property="insuranceCompanyBizId" column="insurance_company_biz_id" />
...@@ -90,7 +91,7 @@ ...@@ -90,7 +91,7 @@
direct_payment_enabled,issue_number,guarantee_period,sum_insured,payment_frequency, direct_payment_enabled,issue_number,guarantee_period,sum_insured,payment_frequency,
each_issue_premium,is_prepay,is_traceable,retroactive_date,prepaid_term, each_issue_premium,is_prepay,is_traceable,retroactive_date,prepaid_term,
prepaid_amount,prepaid_amount_after_discount,policy_expiration_date,payment_number,product_launch_biz_id, prepaid_amount,prepaid_amount_after_discount,policy_expiration_date,payment_number,product_launch_biz_id,
product_name,product_cate,insurance_company,insurance_company_biz_id,reconciliation_company,insurance_category_biz_id, product_name,product_cate,category_code,insurance_company,insurance_company_biz_id,reconciliation_company,insurance_category_biz_id,
reconciliation_company_biz_id,status,next_status_list,policy_holder,insured, reconciliation_company_biz_id,status,next_status_list,policy_holder,insured,
insured_age,grace_period,is_join,policy_currency,initial_payment_method, insured_age,grace_period,is_join,policy_currency,initial_payment_method,
initial_premium,initial_premium_total,initial_payment_status,initial_premium_discount, initial_premium,initial_premium_total,initial_payment_status,initial_premium_discount,
......
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