Skip to content

Y
yd-csf
Commit 0d1cd1c1 by zhangxingmin
Options

push

parent d0083b0a
Showing with 185 additions and 1 deletions
yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiAppointmentServiceImpl.java
...@@ -6,6 +6,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; ...@@ -6,6 +6,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.google.gson.reflect.TypeToken; import com.google.gson.reflect.TypeToken;
import com.yd.auth.core.dto.AuthUserDto; import com.yd.auth.core.dto.AuthUserDto;
import com.yd.auth.core.utils.SecurityUtil; import com.yd.auth.core.utils.SecurityUtil;
import com.yd.base.feign.client.relobjectcertificate.ApiRelObjectCertificateFeignClient;
import com.yd.base.feign.dto.ApiCertificateDto;
import com.yd.base.feign.request.relobjectcertificate.ApiRelObjectCertificateListAddRequest;
import com.yd.common.constant.CodeGeneratorConstants; import com.yd.common.constant.CodeGeneratorConstants;
import com.yd.common.enums.CommonEnum; import com.yd.common.enums.CommonEnum;
import com.yd.common.enums.ResultCode; import com.yd.common.enums.ResultCode;
...@@ -43,6 +46,7 @@ import org.springframework.transaction.annotation.Transactional; ...@@ -43,6 +46,7 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.validation.constraints.NotBlank;
import java.time.ZoneId; import java.time.ZoneId;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
......
yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiInsurantServiceImpl.java
package com.yd.csf.api.service.impl; package com.yd.csf.api.service.impl;
import com.yd.base.feign.client.relobjectcertificate.ApiRelObjectCertificateFeignClient;
import com.yd.base.feign.dto.ApiCertificateDto;
import com.yd.base.feign.request.relobjectcertificate.ApiRelObjectCertificateListAddRequest;
import com.yd.base.feign.request.relobjectcertificate.ApiRelObjectCertificateListRequest;
import com.yd.base.feign.response.relobjectcertificate.ApiRelObjectCertificateListResponse;
import com.yd.common.enums.CommonEnum; import com.yd.common.enums.CommonEnum;
import com.yd.common.enums.ResultCode; import com.yd.common.enums.ResultCode;
import com.yd.common.exception.BusinessException; import com.yd.common.exception.BusinessException;
...@@ -25,6 +30,7 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -25,6 +30,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
import java.util.stream.Collectors; import java.util.stream.Collectors;
...@@ -48,6 +54,9 @@ public class ApiInsurantServiceImpl implements ApiInsurantService { ...@@ -48,6 +54,9 @@ public class ApiInsurantServiceImpl implements ApiInsurantService {
@Autowired @Autowired
private ApiTaxationService apiTaxationService; private ApiTaxationService apiTaxationService;
@Autowired
private ApiRelObjectCertificateFeignClient apiRelObjectCertificateFeignClient;
/** /**
* 受保人信息详情 * 受保人信息详情
* @param appointmentBizId 预约信息主表唯一业务ID * @param appointmentBizId 预约信息主表唯一业务ID
...@@ -63,11 +72,34 @@ public class ApiInsurantServiceImpl implements ApiInsurantService { ...@@ -63,11 +72,34 @@ public class ApiInsurantServiceImpl implements ApiInsurantService {
BeanUtils.copyProperties(insurant,dto); BeanUtils.copyProperties(insurant,dto);
//地址列表 //地址列表
dto.setAddressList(CommonUtil.getAddressList(insurant.getAddressList())); dto.setAddressList(CommonUtil.getAddressList(insurant.getAddressList()));
//查询证件列表信息
dto.setApiCertificateDtoList(apiCertificateDtoList(insurant.getInsurantBizId()));
} }
return Result.success(dto); return Result.success(dto);
} }
/** /**
* 查询证件列表信息
* @param insurantBizId
* @return
*/
public List<ApiCertificateDto> apiCertificateDtoList(String insurantBizId) {
List<ApiCertificateDto> apiCertificateDtoList = new ArrayList<>();
//查询受保人证件列表信息
Result<List<ApiRelObjectCertificateListResponse>> result = apiRelObjectCertificateFeignClient.list(ApiRelObjectCertificateListRequest.builder()
.objectBizId(insurantBizId)
.build());
if (!CollectionUtils.isEmpty(result.getData())) {
apiCertificateDtoList = result.getData().stream().map(dto -> {
ApiCertificateDto apiCertificateDto = new ApiCertificateDto();
BeanUtils.copyProperties(dto,apiCertificateDto);
return apiCertificateDto;
}).collect(Collectors.toList());
}
return apiCertificateDtoList;
}
/**
* 编辑受保人信息 * 编辑受保人信息
* @param apiInsurantInfoDto * @param apiInsurantInfoDto
* @return * @return
...@@ -124,6 +156,25 @@ public class ApiInsurantServiceImpl implements ApiInsurantService { ...@@ -124,6 +156,25 @@ public class ApiInsurantServiceImpl implements ApiInsurantService {
.apiTaxationDtoList(apiTaxationDtoList) .apiTaxationDtoList(apiTaxationDtoList)
.build()); .build());
} }
//查询投保人证件列表信息
Result<List<ApiRelObjectCertificateListResponse>> certificateListResult = apiRelObjectCertificateFeignClient.list(ApiRelObjectCertificateListRequest.builder().objectBizId(policyholder.getPolicyholderBizId()).build());
if (!CollectionUtils.isEmpty(certificateListResult.getData())) {
List<ApiCertificateDto> apiCertificateDtoList = certificateListResult.getData()
.stream().map(d -> {
ApiCertificateDto apiCertificateDto = new ApiCertificateDto();
BeanUtils.copyProperties(d,apiCertificateDto);
return apiCertificateDto;
}).collect(Collectors.toList());
//添加受保人证件列表信息
apiRelObjectCertificateFeignClient.addRelObjectCertificateList(ApiRelObjectCertificateListAddRequest.builder()
.objectBizId(insurant.getInsurantBizId())
.objectName(CommonEnum.UID_TYPE_INSURANT.getName())
.objectTableName(CommonEnum.UID_TYPE_INSURANT.getCode())
.objectType(CommonEnum.UID_TYPE_INSURANT.getCode())
.apiCertificateDtoList(apiCertificateDtoList)
.build());
}
return Result.success(insurant); return Result.success(insurant);
} }
} }
...@@ -148,6 +199,17 @@ public class ApiInsurantServiceImpl implements ApiInsurantService { ...@@ -148,6 +199,17 @@ public class ApiInsurantServiceImpl implements ApiInsurantService {
.apiTaxationDtoList(dto.getApiTaxationDtoList()) .apiTaxationDtoList(dto.getApiTaxationDtoList())
.build()); .build());
} }
//添加受保人证件列表信息
if (!CollectionUtils.isEmpty(dto.getApiCertificateDtoList())) {
apiRelObjectCertificateFeignClient.addRelObjectCertificateList(ApiRelObjectCertificateListAddRequest.builder()
.objectBizId(insurant.getInsurantBizId())
.objectName(CommonEnum.UID_TYPE_INSURANT.getName())
.objectTableName(CommonEnum.UID_TYPE_INSURANT.getCode())
.objectType(CommonEnum.UID_TYPE_INSURANT.getCode())
.apiCertificateDtoList(dto.getApiCertificateDtoList())
.build());
}
return Result.success(insurant); return Result.success(insurant);
} }
...@@ -197,6 +259,25 @@ public class ApiInsurantServiceImpl implements ApiInsurantService { ...@@ -197,6 +259,25 @@ public class ApiInsurantServiceImpl implements ApiInsurantService {
.apiTaxationDtoList(apiTaxationDtoList) .apiTaxationDtoList(apiTaxationDtoList)
.build()); .build());
} }
//查询投保人证件列表信息
Result<List<ApiRelObjectCertificateListResponse>> certificateListResult = apiRelObjectCertificateFeignClient.list(ApiRelObjectCertificateListRequest.builder().objectBizId(policyholder.getPolicyholderBizId()).build());
if (!CollectionUtils.isEmpty(certificateListResult.getData())) {
List<ApiCertificateDto> apiCertificateDtoList = certificateListResult.getData()
.stream().map(d -> {
ApiCertificateDto apiCertificateDto = new ApiCertificateDto();
BeanUtils.copyProperties(d,apiCertificateDto);
return apiCertificateDto;
}).collect(Collectors.toList());
//添加受保人证件列表信息
apiRelObjectCertificateFeignClient.addRelObjectCertificateList(ApiRelObjectCertificateListAddRequest.builder()
.objectBizId(insurant.getInsurantBizId())
.objectName(CommonEnum.UID_TYPE_INSURANT.getName())
.objectTableName(CommonEnum.UID_TYPE_INSURANT.getCode())
.objectType(CommonEnum.UID_TYPE_INSURANT.getCode())
.apiCertificateDtoList(apiCertificateDtoList)
.build());
}
return Result.success(insurant); return Result.success(insurant);
} }
} }
...@@ -218,6 +299,17 @@ public class ApiInsurantServiceImpl implements ApiInsurantService { ...@@ -218,6 +299,17 @@ public class ApiInsurantServiceImpl implements ApiInsurantService {
.apiTaxationDtoList(dto.getApiTaxationDtoList()) .apiTaxationDtoList(dto.getApiTaxationDtoList())
.build()); .build());
} }
//添加受保人证件列表信息
if (!CollectionUtils.isEmpty(dto.getApiCertificateDtoList())) {
apiRelObjectCertificateFeignClient.addRelObjectCertificateList(ApiRelObjectCertificateListAddRequest.builder()
.objectBizId(insurant.getInsurantBizId())
.objectName(CommonEnum.UID_TYPE_INSURANT.getName())
.objectTableName(CommonEnum.UID_TYPE_INSURANT.getCode())
.objectType(CommonEnum.UID_TYPE_INSURANT.getCode())
.apiCertificateDtoList(dto.getApiCertificateDtoList())
.build());
}
return Result.success(insurant); return Result.success(insurant);
} }
......
yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiPolicyholderServiceImpl.java
package com.yd.csf.api.service.impl; package com.yd.csf.api.service.impl;
import com.yd.base.feign.client.relobjectcertificate.ApiRelObjectCertificateFeignClient;
import com.yd.base.feign.dto.ApiCertificateDto;
import com.yd.base.feign.request.relobjectcertificate.ApiRelObjectCertificateListAddRequest;
import com.yd.base.feign.request.relobjectcertificate.ApiRelObjectCertificateListRequest;
import com.yd.base.feign.response.relobjectcertificate.ApiRelObjectCertificateListResponse;
import com.yd.common.enums.CommonEnum; import com.yd.common.enums.CommonEnum;
import com.yd.common.enums.ResultCode; import com.yd.common.enums.ResultCode;
import com.yd.common.exception.BusinessException; import com.yd.common.exception.BusinessException;
...@@ -20,7 +25,10 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -20,7 +25,10 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects; import java.util.Objects;
import java.util.stream.Collectors;
/** /**
* 投保人信息业务实现类 * 投保人信息业务实现类
...@@ -38,6 +46,9 @@ public class ApiPolicyholderServiceImpl implements ApiPolicyholderService { ...@@ -38,6 +46,9 @@ public class ApiPolicyholderServiceImpl implements ApiPolicyholderService {
@Autowired @Autowired
private ApiTaxationService apiTaxationService; private ApiTaxationService apiTaxationService;
@Autowired
private ApiRelObjectCertificateFeignClient apiRelObjectCertificateFeignClient;
/** /**
* 投保人信息详情 * 投保人信息详情
* @param appointmentBizId 预约信息主表唯一业务ID * @param appointmentBizId 预约信息主表唯一业务ID
...@@ -54,11 +65,34 @@ public class ApiPolicyholderServiceImpl implements ApiPolicyholderService { ...@@ -54,11 +65,34 @@ public class ApiPolicyholderServiceImpl implements ApiPolicyholderService {
BeanUtils.copyProperties(policyholder,dto); BeanUtils.copyProperties(policyholder,dto);
//地址列表 //地址列表
dto.setAddressList(CommonUtil.getAddressList(policyholder.getAddressList())); dto.setAddressList(CommonUtil.getAddressList(policyholder.getAddressList()));
dto.setApiCertificateDtoList(apiCertificateDtoList(policyholder.getPolicyholderBizId()));
} }
return Result.success(dto); return Result.success(dto);
} }
/** /**
* 查询证件列表信息
* @param policyholderBizId
* @return
*/
public List<ApiCertificateDto> apiCertificateDtoList(String policyholderBizId) {
List<ApiCertificateDto> apiCertificateDtoList = new ArrayList<>();
//查询投保人证件列表信息
Result<List<ApiRelObjectCertificateListResponse>> result = apiRelObjectCertificateFeignClient.list(ApiRelObjectCertificateListRequest.builder()
.objectBizId(policyholderBizId)
.build());
if (!CollectionUtils.isEmpty(result.getData())) {
apiCertificateDtoList = result.getData().stream().map(dto -> {
ApiCertificateDto apiCertificateDto = new ApiCertificateDto();
BeanUtils.copyProperties(dto,apiCertificateDto);
return apiCertificateDto;
}).collect(Collectors.toList());
}
return apiCertificateDtoList;
}
/**
* 编辑投保人信息 * 编辑投保人信息
* @param apiPolicyholderInfoDto * @param apiPolicyholderInfoDto
* @return * @return
...@@ -105,10 +139,44 @@ public class ApiPolicyholderServiceImpl implements ApiPolicyholderService { ...@@ -105,10 +139,44 @@ public class ApiPolicyholderServiceImpl implements ApiPolicyholderService {
.apiTaxationDtoList(dto.getApiTaxationDtoList()) .apiTaxationDtoList(dto.getApiTaxationDtoList())
.build()); .build());
} }
//添加投保人证件列表信息
if (!CollectionUtils.isEmpty(dto.getApiCertificateDtoList())) {
//新增对象证件关系信息
addRelObjectCertificateList(policyholder.getPolicyholderBizId(),
CommonEnum.UID_TYPE_POLICYHOLDER.getCode(),
CommonEnum.UID_TYPE_POLICYHOLDER.getCode(),
CommonEnum.UID_TYPE_POLICYHOLDER.getName(),
dto.getApiCertificateDtoList()
);
}
return Result.success(policyholder); return Result.success(policyholder);
} }
/** /**
* 新增对象证件关系信息
* @param objectBizId
* @param objectType
* @param objectTableName
* @param objectName
* @param apiCertificateDtoList
* @return
*/
public Result addRelObjectCertificateList(String objectBizId,
String objectType,
String objectTableName,
String objectName,
List<ApiCertificateDto> apiCertificateDtoList) {
ApiRelObjectCertificateListAddRequest addRequest = new ApiRelObjectCertificateListAddRequest();
addRequest.setObjectBizId(objectBizId);
addRequest.setObjectName(objectName);
addRequest.setObjectTableName(objectTableName);
addRequest.setObjectType(objectType);
addRequest.setApiCertificateDtoList(apiCertificateDtoList);
apiRelObjectCertificateFeignClient.addRelObjectCertificateList(addRequest);
return Result.success();
}
/**
* 编辑投保人信息表数据 * 编辑投保人信息表数据
* @param dto * @param dto
* @param appointmentBizId * @param appointmentBizId
...@@ -143,6 +211,16 @@ public class ApiPolicyholderServiceImpl implements ApiPolicyholderService { ...@@ -143,6 +211,16 @@ public class ApiPolicyholderServiceImpl implements ApiPolicyholderService {
.apiTaxationDtoList(dto.getApiTaxationDtoList()) .apiTaxationDtoList(dto.getApiTaxationDtoList())
.build()); .build());
} }
//添加投保人证件列表信息
if (!CollectionUtils.isEmpty(dto.getApiCertificateDtoList())) {
//新增对象证件关系信息
addRelObjectCertificateList(policyholder.getPolicyholderBizId(),
CommonEnum.UID_TYPE_POLICYHOLDER.getCode(),
CommonEnum.UID_TYPE_POLICYHOLDER.getCode(),
CommonEnum.UID_TYPE_POLICYHOLDER.getName(),
dto.getApiCertificateDtoList()
);
}
return Result.success(policyholder); return Result.success(policyholder);
} }
......
yd-csf-feign/src/main/java/com/yd/csf/feign/dto/appointment/ApiInsurantInfoDto.java
package com.yd.csf.feign.dto.appointment; package com.yd.csf.feign.dto.appointment;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.yd.base.feign.dto.ApiCertificateDto;
import com.yd.csf.feign.dto.AddressDto; import com.yd.csf.feign.dto.AddressDto;
import com.yd.csf.feign.dto.taxation.ApiTaxationDto; import com.yd.csf.feign.dto.taxation.ApiTaxationDto;
import com.yd.csf.feign.enums.RelTypeEnum; import com.yd.csf.feign.enums.RelTypeEnum;
...@@ -342,6 +343,11 @@ public class ApiInsurantInfoDto { ...@@ -342,6 +343,11 @@ public class ApiInsurantInfoDto {
*/ */
private List<ApiTaxationDto> apiTaxationDtoList; private List<ApiTaxationDto> apiTaxationDtoList;
/**
* 证件信息列表
*/
private List<ApiCertificateDto> apiCertificateDtoList;
// 判断与投保人关系是否为本人关系 // 判断与投保人关系是否为本人关系
public boolean isSelf() { public boolean isSelf() {
return RelTypeEnum.MYSELF.getItemValue().equals(policyholderRel); return RelTypeEnum.MYSELF.getItemValue().equals(policyholderRel);
......
yd-csf-feign/src/main/java/com/yd/csf/feign/dto/appointment/ApiPolicyholderInfoDto.java
package com.yd.csf.feign.dto.appointment; package com.yd.csf.feign.dto.appointment;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.yd.base.feign.dto.ApiCertificateDto;
import com.yd.csf.feign.dto.AddressDto; import com.yd.csf.feign.dto.AddressDto;
import com.yd.csf.feign.dto.taxation.ApiTaxationDto; import com.yd.csf.feign.dto.taxation.ApiTaxationDto;
import lombok.Data; import lombok.Data;
...@@ -335,5 +336,8 @@ public class ApiPolicyholderInfoDto { ...@@ -335,5 +336,8 @@ public class ApiPolicyholderInfoDto {
*/ */
private List<ApiTaxationDto> apiTaxationDtoList; private List<ApiTaxationDto> apiTaxationDtoList;
/**
* 证件信息列表
*/
private List<ApiCertificateDto> apiCertificateDtoList;
} }
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