Skip to content

Y
yd-csf
Commit 786a89b3 by zhangxingmin
Options

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

parents 80058fe5 c63b41b6
Showing with 538 additions and 240 deletions
yd-csf-api/src/main/java/com/yd/csf/api/controller/ApiPolicyFollowController.java
......@@ -287,7 +287,7 @@ public class ApiPolicyFollowController {
PolicyFollow policyFollow = new PolicyFollow();
BeanUtils.copyProperties(policyExcelDTO, policyFollow);
policyFollow.setPolicyBizId(policyBizId);
policyFollow.setInitialPremium(decimalFormat.parse(policyExcelDTO.getInitialPremium()));
// policyFollow.setInitialPremium(decimalFormat.parse(policyExcelDTO.getInitialPremium()));
policyFollow.setCustomerName(policyExcelDTO.getPolicyHolder());
policyFollow.setCustomerBizId(customerNameToBizIdMap.get(policyExcelDTO.getPolicyHolder()));
PolicyFollowStatusEnum policyFollowStatusEnum = PolicyFollowStatusEnum.getEnumByItemLabel(policyExcelDTO.getStatus());
......@@ -301,7 +301,7 @@ public class ApiPolicyFollowController {
policyFollow.setCoolingOffEndDate(DateUtil.offset(policyFollow.getEffectiveDate(), DateField.DAY_OF_MONTH, policyFollow.getCoolingOffDays()));
}
// 获取币种字典值
policyFollow.setCurrency(policyFollowService.getCurrencyValue(policyExcelDTO.getCurrency()));
policyFollow.setPolicyCurrency(policyFollowService.getCurrencyValue(policyExcelDTO.getCurrency()));
// 转换为Policy对象
Policy policy = new Policy();
......@@ -351,17 +351,16 @@ public class ApiPolicyFollowController {
/**
* 创建新单跟进
*
* @param policyFollowAddRequest
* @param request
* @param policyFollowDto
* @return
*/
@Operation(summary = "创建新单跟进")
@Operation(summary = "创建新单跟进（统一DTO）")
@PostMapping("/add")
public Result<Map<String, Object>> addPolicyFollow(@RequestBody PolicyFollowAddRequest policyFollowAddRequest, HttpServletRequest request) {
if (policyFollowAddRequest == null) {
return Result.fail(ErrorCode.PARAMS_ERROR.getCode(), ErrorCode.PARAMS_ERROR.getMessage());
public Result<Map<String, Object>> addPolicyFollowV2(@RequestBody PolicyFollowDto policyFollowDto) {
if (policyFollowDto == null) {
return Result.fail(ErrorCode.PARAMS_ERROR.getCode(), "请求参数不能为空");
}
return Result.success(policyFollowService.addPolicyFollow(policyFollowAddRequest));
return Result.success(policyFollowService.addPolicyFollowDto(policyFollowDto));
}
/**
......@@ -417,18 +416,18 @@ public class ApiPolicyFollowController {
}
/**
* 更新新单跟进
* 更新新单跟进（使用统一DTO）
*
* @param policyFollowUpdateRequest
* @param policyFollowDto
* @return
*/
@PostMapping("/update")
@Operation(summary = "更新新单跟进信息")
public Result<Boolean> updatePolicyFollow(@RequestBody PolicyFollowUpdateRequest policyFollowUpdateRequest) {
if (policyFollowUpdateRequest == null || StringUtils.isBlank(policyFollowUpdateRequest.getPolicyBizId())) {
@Operation(summary = "更新新单跟进信息（统一DTO）")
public Result<Boolean> updatePolicyFollowV2(@RequestBody PolicyFollowDto policyFollowDto) {
if (policyFollowDto == null || StringUtils.isBlank(policyFollowDto.getPolicyBizId())) {
return Result.fail(ErrorCode.PARAMS_ERROR.getCode(), "policyBizId不能为空");
}
return Result.success(policyFollowService.updatePolicyFollow(policyFollowUpdateRequest));
return Result.success(policyFollowService.updatePolicyFollowDto(policyFollowDto));
}
/**
......
yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiAppointmentServiceImpl.java
......@@ -643,8 +643,7 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService {
// follow.setReconciliationCompanyBizId();
//TODO 续保日期
// follow.setRenewalDate();
// 用户业务员id
follow.setUserBizId(appointment.getCreatorId());
if (!Objects.isNull(apiInsurantInfoDto)) {
// 受保人
follow.setInsured(apiInsurantInfoDto.getNameCn());
......@@ -656,7 +655,7 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService {
if (!Objects.isNull(apiProductPlanMainInfoDto)) {
//币种
follow.setCurrency(apiProductPlanMainInfoDto.getPolicyCurrency());
follow.setPolicyCurrency(apiProductPlanMainInfoDto.getPolicyCurrency());
//生效日期
// if (!Objects.isNull(apiProductPlanMainInfoDto.getPolicyEffectiveDate())) {
// follow.setEffectiveDate(Date.from(apiProductPlanMainInfoDto.getPolicyEffectiveDate().atZone(ZoneId.systemDefault()).toInstant()));
......@@ -665,19 +664,9 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService {
follow.setInitialPremium(apiProductPlanMainInfoDto.getEachIssuePremium());
//保险公司
follow.setInsuranceCompany(apiProductPlanMainInfoDto.getCompanyName());
//是否预缴
follow.setIsPrepaid(apiProductPlanMainInfoDto.getIsPrepay());
//供款年期
if (StringUtils.isNotBlank(apiProductPlanMainInfoDto.getIssueNumber())) {
follow.setPaymentTerm(apiProductPlanMainInfoDto.getIssueNumber());
if (follow.getPaymentTerm() == null) {
follow.setPaymentTerm(productPlan.getIssueNumber());
}
}
//产品名称
follow.setProductName(apiProductPlanMainInfoDto.getProductLaunchMainName());
//签单员列表
setSignerList(follow, appointment);
}
policyFollowService.saveOrUpdate(follow);
......@@ -720,7 +709,7 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService {
signer.setEmail(appointment.getBusinessRepresentEmail1());
}
signerList.add(signer);
follow.setSignerList(GSONUtil.toJson(signerList));
}
private void savePolicyQuestionnaire(String appointmentBizId, String policyBizId) {
......
yd-csf-service/src/main/java/com/yd/csf/service/dto/PolicyFollowDto.java 0 → 100644
package com.yd.csf.service.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
/**
* 新单跟进统一请求DTO - 用于新增和修改
*/
@Data
public class PolicyFollowDto implements Serializable {
private static final long serialVersionUID = 1L;
@Schema(description = "新单跟进唯一业务ID（修改时必填）")
private String policyBizId;
@Schema(description = "保单号")
private String policyNo;
@Schema(description = "预约信息主表唯一业务ID")
private String appointmentBizId;
@Schema(description = "预约编号")
private String appointmentNo;
@Schema(description = "客户业务id")
private String customerBizId;
@Schema(description = "递交日期", format = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date submitDate;
@Schema(description = "客户名称")
private String customerName;
@Schema(description = "签单日期", format = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date signDate;
@Schema(description = "签单人")
private String signer;
@Schema(description = "签单人业务id")
private String signerBizId;
@Schema(description = "签单人执业编号")
private String signerRegNo;
@Schema(description = "签单地点")
private String signLocation;
@Schema(description = "缮发日期", format = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date issueDate;
@Schema(description = "冷静期结束日期", format = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date coolingOffEndDate;
@Schema(description = "冷静期天数")
private Integer coolingOffDays;
@Schema(description = "核保日期", format = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date underwritingDate;
@Schema(description = "生效日期", format = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date effectiveDate;
@Schema(description = "续保日期", format = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date renewalDate;
@Schema(description = "保单回执日期", format = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date receiptDate;
@Schema(description = "回执状态")
private String receiptStatus;
@Schema(description = "是否开通直接支付: 0-否, 1-是")
private Integer directPaymentEnabled;
@Schema(description = "供款年期")
private Integer issueNumber;
@Schema(description = "保障期限")
private Integer guaranteePeriod;
@Schema(description = "保额（重疾险）")
private BigDecimal sumInsured;
@Schema(description = "付款频率（字典）")
private String paymentFrequency;
@Schema(description = "每期保费")
private BigDecimal eachIssuePremium;
@Schema(description = "是否预缴: 0-否, 1-是")
private Integer isPrepay;
@Schema(description = "是否追溯: 0-否, 1-是")
private Integer isTraceable;
@Schema(description = "回溯日期", format = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date retroactiveDate;
@Schema(description = "预缴年期")
private Integer prepaidTerm;
@Schema(description = "预付额")
private String prepaidAmount;
@Schema(description = "折扣后预付额")
private String prepaidAmountAfterDiscount;
@Schema(description = "保单截止日期", format = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date policyExpirationDate;
@Schema(description = "缴费编号")
private String paymentNumber;
@Schema(description = "产品上架信息表唯一业务ID")
private String productLaunchBizId;
@Schema(description = "产品名称")
private String productName;
@Schema(description = "产品类别")
private String productCate;
@Schema(description = "保险公司")
private String insuranceCompany;
@Schema(description = "保险公司业务id")
private String insuranceCompanyBizId;
@Schema(description = "对账公司")
private String reconciliationCompany;
@Schema(description = "对账公司业务id")
private String reconciliationCompanyBizId;
@Schema(description = "新单跟进状态")
private String status;
@Schema(description = "下一步跟进状态列表")
private String nextStatusList;
@Schema(description = "保單持有人")
private String policyHolder;
@Schema(description = "受保人")
private String insured;
@Schema(description = "受保人年龄")
private Integer insuredAge;
@Schema(description = "宽限期")
private Integer gracePeriod;
@Schema(description = "是否参加递增保障权益: 0-否, 1-是（字典）")
private Integer isJoin;
@Schema(description = "保单币种")
private String policyCurrency;
@Schema(description = "首期付款方式（字典）")
private String initialPaymentMethod;
@Schema(description = "首期保费（不含徽费，预缴保费）")
private BigDecimal initialPremium;
@Schema(description = "寄送方式（字典）: 1-自提 2-快递")
private String mailingMethod;
@Schema(description = "续期付款方式（字典）")
private String renewalPaymentMethod;
@Schema(description = "红利付款方式（字典）")
private String dividendPaymentMethod;
@Schema(description = "快递单号")
private String deliveryNo;
@Schema(description = "保单征费")
private String policyLevy;
@Schema(description = "首期保费已付")
private String initialPremiumPaid;
@Schema(description = "首期保费应付")
private String initialPremiumDue;
@Schema(description = "最近付款日期", format = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date latestPaymentDate;
@Schema(description = "经纪公司签收日期", format = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date brokerSignDate;
@Schema(description = "保险公司寄出日期", format = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date insurerMailingDate;
@Schema(description = "客户签收日期", format = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date customerSignDate;
@Schema(description = "转介人列表")
private List<PolicyBrokerDto> brokerList;
}
yd-csf-service/src/main/java/com/yd/csf/service/dto/PolicyFollowUpdateDto.java
......@@ -20,37 +20,55 @@ public class PolicyFollowUpdateDto implements Serializable {
private String policyBizId;
/**
* 客户名称
*/
@Schema(description = "客户名称")
private String customerName;
/**
* 客户编号
*/
@Schema(description = "客户编号")
private String customerBizId;
/**
* 签单日期
*/
@Schema(description = "签单日期", format = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date signDate;
/**
* 签单员
*/
@Schema(description = "签单员")
private PolicySigner signer;
/**
* 签单员执业编号
*/
@Schema(description = "签单员执业编号")
private String signerRegNo;
/**
* 签单地点
*/
@Schema(description = "签单地点")
private String signLocation;
/**
* 保单号
*/
@Schema(description = "保单号")
private String policyNo;
/**
* 签单日期
* 产品计划业务id
*/
@Schema(description = "签单日期", format = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date signDate;
@Schema(description = "产品计划业务id")
private String productLaunchBizId;
/**
* 签单员列表
* 产品名称
*/
@Schema(description = "签单员列表")
private List<PolicySigner> signerList;
@Schema(description = "产品名称")
private String productName;
/**
/**
* 冷静期天数
*/
@Schema(description = "冷静期天数")
......@@ -77,41 +95,8 @@ public class PolicyFollowUpdateDto implements Serializable {
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date renewalDate;
/**
* 供款年期
*/
@Schema(description = "供款年期")
private Integer paymentTerm;
/**
* 期交保费
*/
@Schema(description = "期交保费")
private BigDecimal paymentPremium;
/**
* 是否预缴: 0-否, 1-是
*/
@Schema(description = "是否预缴: 0-否, 1-是")
private Integer isPrepaid;
/**
* 预缴年期
*/
@Schema(description = "预缴年期")
private Integer prepaidTerm;
/**
* 产品计划业务id
*/
@Schema(description = "产品计划业务id")
private String productLaunchBizId;
/**
* 产品名称
*/
@Schema(description = "产品名称")
private String productName;
/**
* 产品类别
......@@ -156,45 +141,10 @@ public class PolicyFollowUpdateDto implements Serializable {
private String insured;
/**
* 币种
* 保单币种
*/
@Schema(description = "币种")
private String currency;
@Schema(description = "保单币种")
private String policyCurrency;
/**
* 首期保费（不含徽费，预缴保费）
*/
@Schema(description = "首期保费（不含徽费，预缴保费）")
private Object initialPremium;
/**
* 保单征费
*/
@Schema(description = "保单征费")
private String policyLevy;
/**
* 首期已交保费
*/
@Schema(description = "首期已交保费")
private String initialPremiumPaid;
/**
* 首期待交保费
*/
@Schema(description = "首期待交保费")
private String initialPremiumDue;
/**
* 最晚缴费日期
*/
@Schema(description = "最晚缴费日期 格式: yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date latestPaymentDate;
/**
* 备注
*/
@Schema(description = "备注")
private String remark;
}
yd-csf-service/src/main/java/com/yd/csf/service/model/PolicyFollow.java
package com.yd.csf.service.model;
import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
/**
......@@ -45,79 +43,129 @@ public class PolicyFollow implements Serializable {
private String appointmentNo;
/**
* 用户业务id
* 客户业务id
*/
private String userBizId;
private String customerBizId;
/**
* 客户业务id
* 递交日期
*/
private String customerBizId;
private Date submitDate;
/**
* 客户名称
*/
private String customerName;
/**
* 递交日期
*/
private Date submitDate;
/**
* 签单日期
*/
private Date signDate;
/**
* 签单员列表
* 签单人
*/
private String signerList;
private String signer;
/**
* 缮发日期
* 签单人业务id
*/
private Date issueDate;
private String signerBizId;
/**
* 生效日期
* 签单人执业编号
*/
private Date effectiveDate;
private String signerRegNo;
/**
* 核保日期
* 签单地点
*/
private Date underwritingDate;
private String signLocation;
/**
* 缮发日期
*/
private Date issueDate;
/**
* 冷却期结束日期
/**
* 冷静期结束日期
*/
private Date coolingOffEndDate;
/**
* 冷却期天数
/**
* 冷静期天数
*/
private Integer coolingOffDays;
/**
* 核保日期
*/
private Date underwritingDate;
/**
* 生效日期
*/
private Date effectiveDate;
/**
* 续保日期
*/
private Date renewalDate;
/**
* 保单回执日期
*/
private Date receiptDate;
/**
* 回执状态
*/
private String receiptStatus;
/**
* 是否开通直接支付
*/
private Integer directPaymentEnabled;
/**
* 供款年期
*/
private Object paymentTerm;
private Integer issueNumber;
/**
* 保障期限
*/
private Integer guaranteePeriod;
/**
* 保额（重疾险）
*/
private BigDecimal sumInsured;
/**
* 付款频率（字典）
*/
private String paymentFrequency;
/**
* 期交保费
* 每期保费
*/
private BigDecimal paymentPremium;
private BigDecimal eachIssuePremium;
/**
* 是否预缴: 0-否, 1-是
*/
private Integer isPrepaid;
private Integer isPrepay;
/**
* 是否追溯: 0-否, 1-是
*/
private Integer isTraceable;
/**
* 回溯日期
*/
private Date retroactiveDate;
/**
* 预缴年期
......@@ -144,7 +192,7 @@ public class PolicyFollow implements Serializable {
*/
private String paymentNumber;
/**
/**
* 产品上架信息表唯一业务ID
*/
private String productLaunchBizId;
......@@ -184,10 +232,10 @@ public class PolicyFollow implements Serializable {
*/
private String status;
/**
/**
* 下一步跟进状态列表
*/
private Object nextStatusList;
private String nextStatusList;
/**
* 保單持有人
......@@ -200,74 +248,103 @@ public class PolicyFollow implements Serializable {
private String insured;
/**
* 币种
* 受保人年龄
*/
private String currency;
private Integer insuredAge;
/**
* 首期保费（不含徽费，预缴保费）
* 宽限期
*/
private Object initialPremium;
private Integer gracePeriod;
/**
* 保单征费
/**
* 是否参加递增保障权益: 0-否, 1-是（字典）
*/
private String policyLevy;
private Integer isJoin;
/**
* 首期已交保费
* 保单币种
*/
private String initialPremiumPaid;
private String policyCurrency;
/**
* 首期待交保费
* 首期付款方式（字典）
*/
private String initialPremiumDue;
private String initialPaymentMethod;
/**
* 最晚缴费日期
* 首期保费（不含徽费，预缴保费）
*/
private Date latestPaymentDate;
private BigDecimal initialPremium;
/**
* 寄送方式 1-自提, 2-快递
* 寄送方式 字典值：1-自提 2-快递
*/
private String mailingMethod;
/**
* 续期付款方式（字典）
*/
private String renewalPaymentMethod;
/**
* 红利付款方式（字典）
*/
private String dividendPaymentMethod;
/**
* 快递单号
*/
private String deliveryNo;
/**
* 保单征费
*/
private String policyLevy;
/**
*
*/
private String initialPremiumPaid;
/**
*
*/
private String initialPremiumDue;
/**
*
*/
private Date latestPaymentDate;
/**
* 经纪公司签收日期
*/
private String brokerSignDate;
private Date brokerSignDate;
/**
* 保险公司寄出日期
*/
private String insurerMailingDate;
private Date insurerMailingDate;
/**
* 客户签收日期
*/
private String customerSignDate;
private Date customerSignDate;
/**
* 附件列表
* 附件地址列表 逗号隔开
*/
private String attachments;
/**
* 备注
* 通用备注
*/
private String remark;
/**
* 删除标识: 0-正常, 1-删除
*/
@TableField()
private Integer isDeleted;
/**
......
yd-csf-service/src/main/java/com/yd/csf/service/service/PolicyFollowService.java
......@@ -27,10 +27,20 @@ public interface PolicyFollowService extends IService<PolicyFollow> {
Boolean updatePolicyFollow(PolicyFollowUpdateRequest policyFollowUpdateRequest);
/**
* 使用统一DTO更新新单跟进
*/
Boolean updatePolicyFollowDto(PolicyFollowDto policyFollowDto);
PolicyFollowVO getPolicyFollowVO(PolicyFollow policyFollow);
Map<String, Object> addPolicyFollow(PolicyFollowAddRequest policyFollowAddRequest);
/**
* 使用统一DTO新增新单跟进
*/
Map<String, Object> addPolicyFollowDto(PolicyFollowDto policyFollowDto);
Boolean addToPolicy(List<String> policyNoList);
Boolean changePolicyFollowStatus(ChangePolicyFollowStatusRequest changePolicyFollowStatusRequest, PolicyFollow policyFollow);
......
yd-csf-service/src/main/java/com/yd/csf/service/service/impl/PolicyFollowServiceImpl.java
......@@ -154,14 +154,13 @@ public class PolicyFollowServiceImpl extends ServiceImpl<PolicyFollowMapper, Pol
PolicyFollowUpdateDto policyFollowUpdateDto = policyFollowUpdateRequest.getPolicyFollowUpdateDto();
if (policyFollowUpdateDto != null) {
BeanUtils.copyProperties(policyFollowUpdateDto, policyFollow, "id", "policyBizId");
// 签单员列表 => 字符串
policyFollow.setSignerList(GSONUtil.toJson(policyFollowUpdateDto.getSignerList()));
// 计算冷却期结束日期
if (policyFollowUpdateDto.getCoolingOffDays() != null && policyFollowUpdateDto.getEffectiveDate() != null) {
policyFollow.setCoolingOffEndDate(DateUtil.offset(policyFollowUpdateDto.getEffectiveDate(), DateField.DAY_OF_MONTH, policyFollowUpdateDto.getCoolingOffDays()));
}
// 获取币种字典值
policyFollow.setCurrency(this.getCurrencyValue(policyFollowUpdateDto.getCurrency()));
policyFollow.setPolicyCurrency(this.getCurrencyValue(policyFollowUpdateDto.getPolicyCurrency()));
}
// 设置核保信息
setValidPolicyInfo(policyFollow, policyFollowUpdateRequest.getVerifyPolicyInfo());
......@@ -174,31 +173,40 @@ public class PolicyFollowServiceImpl extends ServiceImpl<PolicyFollowMapper, Pol
policyFollow.setUpdaterId(loginUserId);
policyFollow.setUpdateTime(new Date());
// 修改转介人
List<PolicyBrokerDto> brokerList = policyFollowUpdateRequest.getBrokerList();
if (CollUtil.isNotEmpty(brokerList)) {
log.info("修改转介人，查看保单号: {}, 转介人数量: {}", policyFollow.getPolicyNo(), brokerList.size());
// 先删除原有的转介人
policyBrokerService.remove(new QueryWrapper<PolicyBroker>().eq("policy_biz_id", policyBizId));
List<PolicyBroker> policyBrokerList = new ArrayList<>();
for (PolicyBrokerDto policyBrokerDto : brokerList) {
PolicyBroker policyBroker = new PolicyBroker();
BeanUtils.copyProperties(policyBrokerDto, policyBroker);
policyBroker.setPolicyBizId(policyBizId);
policyBroker.setPolicyNo(policyFollow.getPolicyNo());
policyBroker.setCreatorId(loginUserId);
policyBroker.setCreateTime(new Date());
policyBroker.setUpdaterId(loginUserId);
policyBroker.setUpdateTime(new Date());
policyBrokerList.add(policyBroker);
}
return updateById(policyFollow);
}
if (CollUtil.isNotEmpty(policyBrokerList)) {
policyBrokerService.saveBatch(policyBrokerList);
}
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean updatePolicyFollowDto(PolicyFollowDto policyFollowDto) {
// 校验参数
if (StringUtils.isBlank(policyFollowDto.getPolicyBizId())) {
throw new BusinessException(ErrorCode.PARAMS_ERROR.getCode(), "policyBizId不能为空");
}
return updateById(policyFollow);
String policyBizId = policyFollowDto.getPolicyBizId();
PolicyFollow policyFollow = getByPolicyBizId(policyBizId);
if (policyFollow == null) {
throw new BusinessException(ErrorCode.NOT_FOUND_ERROR.getCode(), "新单跟进记录不存在");
}
// 复制属性，排除系统字段
BeanUtils.copyProperties(policyFollowDto, policyFollow, "id", "policyBizId", "brokerList", "signerList");
// 计算冷却期结束日期
if (policyFollowDto.getCoolingOffDays() != null && policyFollowDto.getEffectiveDate() != null) {
policyFollow.setCoolingOffEndDate(DateUtil.offset(policyFollowDto.getEffectiveDate(), DateField.DAY_OF_MONTH, policyFollowDto.getCoolingOffDays()));
}
// 获取当前登录用户
AuthUserDto currentLoginUser = SecurityUtil.getCurrentLoginUser();
String loginUserId = currentLoginUser.getId().toString();
policyFollow.setUpdaterId(loginUserId);
policyFollow.setUpdateTime(new Date());
boolean result = updateById(policyFollow);
return result;
}
private void setPolicyMailing(PolicyFollow policyFollow, PolicyMailing policyMailing) {
......@@ -206,9 +214,9 @@ public class PolicyFollowServiceImpl extends ServiceImpl<PolicyFollowMapper, Pol
return;
}
policyFollow.setMailingMethod(policyMailing.getMailingMethod());
policyFollow.setBrokerSignDate(policyMailing.getBrokerSignDate());
policyFollow.setInsurerMailingDate(policyMailing.getInsurerMailingDate());
policyFollow.setCustomerSignDate(policyMailing.getCustomerSignDate());
// policyFollow.setBrokerSignDate(policyMailing.getBrokerSignDate());
// policyFollow.setInsurerMailingDate(policyMailing.getInsurerMailingDate());
// policyFollow.setCustomerSignDate(policyMailing.getCustomerSignDate());
}
private void setValidPolicyInfo(PolicyFollow policyFollow, VerifyPolicyInfo verifyPolicyInfo) {
......@@ -219,7 +227,7 @@ public class PolicyFollowServiceImpl extends ServiceImpl<PolicyFollowMapper, Pol
policyFollow.setSignDate(verifyPolicyInfo.getSignDate());
policyFollow.setIssueDate(verifyPolicyInfo.getIssueDate());
policyFollow.setEffectiveDate(verifyPolicyInfo.getEffectiveDate());
policyFollow.setIsPrepaid(verifyPolicyInfo.getIsPrepaid());
// policyFollow.setIsPrepaid(verifyPolicyInfo.getIsPrepaid());
policyFollow.setPrepaidAmount(verifyPolicyInfo.getPrepaidAmount());
policyFollow.setPrepaidAmountAfterDiscount(verifyPolicyInfo.getPrepaidAmountAfterDiscount());
policyFollow.setPolicyExpirationDate(verifyPolicyInfo.getPolicyExpirationDate());
......@@ -248,19 +256,15 @@ public class PolicyFollowServiceImpl extends ServiceImpl<PolicyFollowMapper, Pol
// 生成新单编号
String policyBizId = RandomStringGenerator.generateBizId16(CommonEnum.UID_TYPE_POLICY.getCode());
policyFollow.setPolicyBizId(policyBizId);
// 签单员列表 => 字符串
policyFollow.setSignerList(GSONUtil.toJson(policyFollowAddRequest.getSignerList()));
// 计算冷却期结束日期
if (policyFollowAddRequest.getCoolingOffDays() != null) {
policyFollow.setCoolingOffEndDate(DateUtil.offset(policyFollowAddRequest.getEffectiveDate(), DateField.DAY_OF_MONTH, policyFollowAddRequest.getCoolingOffDays()));
}
// 获取币种字典值
policyFollow.setCurrency(this.getCurrencyValue(policyFollowAddRequest.getCurrency()));
policyFollow.setPolicyCurrency(this.getCurrencyValue(policyFollowAddRequest.getCurrency()));
// 创建 Policy对象
Policy policy = new Policy();
BeanUtils.copyProperties(policyFollowAddRequest, policy);
policy.setPolicyBizId(policyBizId);
// 保存转介人
List<PolicyBroker> policyBrokerList = policyFollowAddRequest.getBrokerList();
if (CollUtil.isNotEmpty(policyBrokerList)) {
......@@ -270,18 +274,49 @@ public class PolicyFollowServiceImpl extends ServiceImpl<PolicyFollowMapper, Pol
}
this.save(policyFollow);
policyService.save(policy);
policyBrokerService.saveBatch(policyBrokerList);
// 保险产品相关字段不为空，则查询获取保单预计来佣
String policyNo = policyFollowAddRequest.getPolicyNo();
String productLaunchBizId = policyFollowAddRequest.getProductLaunchBizId();
String insuranceCompanyBizId = policyFollowAddRequest.getInsuranceCompanyBizId();
String reconciliationCompany = policyFollowAddRequest.getReconciliationCompany();
String reconciliationCompanyCode = policyFollowAddRequest.getReconciliationCompanyCode();
String reconciliationCompanyBizId = policyFollowAddRequest.getReconciliationCompanyBizId();
// 保存保单预计来佣
commissionExpectedService.getExpectedCommissionByProductlaunchId(policyNo, productLaunchBizId, insuranceCompanyBizId, reconciliationCompany, reconciliationCompanyCode, reconciliationCompanyBizId);
// String policyNo = policyFollowAddRequest.getPolicyNo();
// String productLaunchBizId = policyFollowAddRequest.getProductLaunchBizId();
// String insuranceCompanyBizId = policyFollowAddRequest.getInsuranceCompanyBizId();
// String reconciliationCompany = policyFollowAddRequest.getReconciliationCompany();
// String reconciliationCompanyCode = policyFollowAddRequest.getReconciliationCompanyCode();
// String reconciliationCompanyBizId = policyFollowAddRequest.getReconciliationCompanyBizId();
// // 保存保单预计来佣
// commissionExpectedService.getExpectedCommissionByProductlaunchId(policyNo, productLaunchBizId, insuranceCompanyBizId, reconciliationCompany, reconciliationCompanyCode, reconciliationCompanyBizId);
// 返回新单跟进唯一业务ID
return Collections.singletonMap("policyBizId", policyBizId);
}
@Override
@Transactional(rollbackFor = Exception.class)
public Map<String, Object> addPolicyFollowDto(PolicyFollowDto policyFollowDto) {
PolicyFollow policyFollow = new PolicyFollow();
// 复制属性，排除系统字段
BeanUtils.copyProperties(policyFollowDto, policyFollow, "id", "policyBizId", "brokerList", "signerList");
// 生成新单编号
String policyBizId = RandomStringGenerator.generateBizId16(CommonEnum.UID_TYPE_POLICY.getCode());
policyFollow.setPolicyBizId(policyBizId);
// 计算冷却期结束日期
if (policyFollowDto.getCoolingOffDays() != null && policyFollowDto.getEffectiveDate() != null) {
policyFollow.setCoolingOffEndDate(DateUtil.offset(policyFollowDto.getEffectiveDate(), DateField.DAY_OF_MONTH, policyFollowDto.getCoolingOffDays()));
}
// 获取当前登录用户
AuthUserDto currentLoginUser = SecurityUtil.getCurrentLoginUser();
String loginUserId = currentLoginUser.getId().toString();
policyFollow.setCreatorId(loginUserId);
policyFollow.setCreateTime(new Date());
policyFollow.setUpdaterId(loginUserId);
policyFollow.setUpdateTime(new Date());
this.save(policyFollow);
// 返回新单跟进唯一业务ID
return Collections.singletonMap("policyBizId", policyBizId);
......
yd-csf-service/src/main/java/com/yd/csf/service/vo/PolicyFollowVO.java
......@@ -82,11 +82,7 @@ public class PolicyFollowVO implements Serializable {
// 转换PolicyFollowUpdateDto
PolicyFollowUpdateDto policyFollowUpdateDto = new PolicyFollowUpdateDto();
BeanUtils.copyProperties(policyFollow, policyFollowUpdateDto);
// 转换 signerList 字段
if (policyFollow.getSignerList() != null) {
policyFollowUpdateDto.setSignerList(GSONUtil.fromJson(policyFollow.getSignerList(), new TypeToken<List<PolicySigner>>() {
}.getType()));
}
policyFollowVO.setPolicyFollowUpdateDto(policyFollowUpdateDto);
// 处理 nextStatusList 字段
......
yd-csf-service/src/main/resources/mappers/PolicyFollowMapper.xml
......@@ -10,20 +10,31 @@
<result property="policyNo" column="policy_no" />
<result property="appointmentBizId" column="appointment_biz_id" />
<result property="appointmentNo" column="appointment_no" />
<result property="userBizId" column="user_biz_id" />
<result property="customerBizId" column="customer_biz_id" />
<result property="submitDate" column="submit_date" />
<result property="customerName" column="customer_name" />
<result property="signDate" column="sign_date" />
<result property="signerList" column="signer_list" />
<result property="signer" column="signer" />
<result property="signerBizId" column="signer_biz_id" />
<result property="signerRegNo" column="signer_reg_no" />
<result property="signLocation" column="sign_location" />
<result property="issueDate" column="issue_date" />
<result property="effectiveDate" column="effective_date" />
<result property="coolingOffEndDate" column="cooling_off_end_date" />
<result property="coolingOffDays" column="cooling_off_days" />
<result property="underwritingDate" column="underwriting_date" />
<result property="effectiveDate" column="effective_date" />
<result property="renewalDate" column="renewal_date" />
<result property="paymentTerm" column="payment_term" />
<result property="paymentPremium" column="payment_premium" />
<result property="isPrepaid" column="is_prepaid" />
<result property="receiptDate" column="receipt_date" />
<result property="receiptStatus" column="receipt_status" />
<result property="directPaymentEnabled" column="direct_payment_enabled" />
<result property="issueNumber" column="issue_number" />
<result property="guaranteePeriod" column="guarantee_period" />
<result property="sumInsured" column="sum_insured" />
<result property="paymentFrequency" column="payment_frequency" />
<result property="eachIssuePremium" column="each_issue_premium" />
<result property="isPrepay" column="is_prepay" />
<result property="isTraceable" column="is_traceable" />
<result property="retroactiveDate" column="retroactive_date" />
<result property="prepaidTerm" column="prepaid_term" />
<result property="prepaidAmount" column="prepaid_amount" />
<result property="prepaidAmountAfterDiscount" column="prepaid_amount_after_discount" />
......@@ -40,14 +51,20 @@
<result property="nextStatusList" column="next_status_list" />
<result property="policyHolder" column="policy_holder" />
<result property="insured" column="insured" />
<result property="currency" column="currency" />
<result property="insuredAge" column="insured_age" />
<result property="gracePeriod" column="grace_period" />
<result property="isJoin" column="is_join" />
<result property="policyCurrency" column="policy_currency" />
<result property="initialPaymentMethod" column="initial_payment_method" />
<result property="initialPremium" column="initial_premium" />
<result property="mailingMethod" column="mailing_method" />
<result property="renewalPaymentMethod" column="renewal_payment_method" />
<result property="dividendPaymentMethod" column="dividend_payment_method" />
<result property="deliveryNo" column="delivery_no" />
<result property="policyLevy" column="policy_levy" />
<result property="initialPremiumPaid" column="initial_premium_paid" />
<result property="initialPremiumDue" column="initial_premium_due" />
<result property="latestPaymentDate" column="latest_payment_date" />
<result property="policyLevy" column="policy_levy" />
<result property="mailingMethod" column="mailing_method" />
<result property="deliveryNo" column="delivery_no" />
<result property="brokerSignDate" column="broker_sign_date" />
<result property="insurerMailingDate" column="insurer_mailing_date" />
<result property="customerSignDate" column="customer_sign_date" />
......@@ -61,16 +78,20 @@
</resultMap>
<sql id="Base_Column_List">
id,policy_biz_id,policy_no,appointment_biz_id,appointment_no,user_biz_id,
customer_biz_id,submit_date,customer_name,sign_date,signer_list,
issue_date,effective_date,cooling_off_end_date,cooling_off_days,renewal_date,payment_term,payment_premium,
is_prepaid,prepaid_term,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,reconciliation_company_biz_id,status,next_status_list,
policy_holder,insured,currency,initial_premium,initial_premium_paid,initial_premium_due,latest_payment_date,policy_levy,mailing_method,
delivery_no,broker_sign_date,insurer_mailing_date,customer_sign_date,attachments,
remark,is_deleted,creator_id,updater_id,create_time,
update_time
id,policy_biz_id,policy_no,appointment_biz_id,appointment_no,customer_biz_id,
submit_date,customer_name,sign_date,signer,signer_biz_id,
signer_reg_no,sign_location,issue_date,cooling_off_end_date,cooling_off_days,
underwriting_date,effective_date,renewal_date,receipt_date,receipt_status,
direct_payment_enabled,issue_number,guarantee_period,sum_insured,payment_frequency,
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,
product_name,product_cate,insurance_company,insurance_company_biz_id,reconciliation_company,
reconciliation_company_biz_id,status,next_status_list,policy_holder,insured,
insured_age,grace_period,is_join,policy_currency,initial_payment_method,
initial_premium,mailing_method,renewal_payment_method,dividend_payment_method,delivery_no,
policy_levy,initial_premium_paid,initial_premium_due,latest_payment_date,broker_sign_date,
insurer_mailing_date,customer_sign_date,attachments,remark,is_deleted,
creator_id,updater_id,create_time,update_time
</sql>
<select id="queryPolicyReportData" resultType="com.yd.csf.service.dto.PolicyReportData">
......
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