push

yd-csf-api/src/main/java/com/yd/csf/api/service/ApiBeneficiaryService.java

@@ -2,6 +2,7 @@ package com.yd.csf.api.service;
 
 import com.yd.common.result.Result;
 import com.yd.csf.feign.dto.appointment.ApiBeneficiaryInfoDto;
+import com.yd.csf.feign.dto.appointment.ApiBeneficiaryInfoFzDto;
 import com.yd.csf.feign.request.beneficiary.ApiBatchEditBeneficiaryRequest;
 
 import java.util.List;

yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiAppointmentCheckServiceImpl.java

@@ -45,7 +45,7 @@ public class ApiAppointmentCheckServiceImpl implements ApiAppointmentCheckServic
         checkAddApiInsurantInfoDto(request.getApiInsurantInfoDto());
 
         //新增预约入参字段校验 - 受益人列表信息字段校验
-        checkAddApiBeneficiaryInfoDtoList(request.getApiBeneficiaryInfoDtoList());
+        checkAddApiBeneficiaryInfoDtoList(request.getApiBeneficiaryInfoFzDto().getApiBeneficiaryInfoDtoList());
 
         //新增预约入参字段校验 - 第二持有人信息字段校验
         checkAddApiSecondHolderInfoDto(request.getApiSecondHolderInfoDto());

yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiBeneficiaryServiceImpl.java

@@ -8,6 +8,7 @@ import com.yd.common.utils.RandomStringGenerator;
 import com.yd.csf.api.service.ApiAppointmentCheckService;
 import com.yd.csf.api.service.ApiBeneficiaryService;
 import com.yd.csf.feign.dto.appointment.ApiBeneficiaryInfoDto;
+import com.yd.csf.feign.dto.appointment.ApiBeneficiaryInfoFzDto;
 import com.yd.csf.feign.request.beneficiary.ApiBatchEditBeneficiaryRequest;
 import com.yd.csf.feign.utils.CommonUtil;
 import com.yd.csf.service.dto.BeneficiaryDto;

yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiPremiumReconciliationServiceImpl.java

@@ -101,7 +101,7 @@ public class ApiPremiumReconciliationServiceImpl implements ApiPremiumReconcilia
         //保单受保人（被保人）
         premiumReconciliation.setInsured(policy.getInsured());
         //保险公司名称
-        premiumReconciliation.setInsurer(policy.getInsurer());
+        premiumReconciliation.setInsurer(policy.getInsuranceCompany());
         //保单号
         premiumReconciliation.setPolicyNo(policy.getPolicyNo());
         //保费对账记录表唯一业务ID

yd-csf-feign/src/main/java/com/yd/csf/feign/dto/appointment/ApiAppointmentInfoDto.java

@@ -166,12 +166,6 @@ public class ApiAppointmentInfoDto {
     private Integer isUseCar;
 
     /**
-     * 是否法定受益人
-     */
-    @NotBlank(message = "签约信息-是否法定受益人不能为空")
-    private String isLegalBeneficiary;
-
-    /**
      * 转介人是否陪同
      */
     private String isReferrerAccompany;

yd-csf-feign/src/main/java/com/yd/csf/feign/dto/appointment/ApiBeneficiaryInfoFzDto.java

+package com.yd.csf.feign.dto.appointment;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.util.List;
+
+@Data
+public class ApiBeneficiaryInfoFzDto {
+
+    /**
+     * 是否法定受益人
+     */
+    @NotBlank(message = "受益人-是否法定受益人不能为空")
+    private String isLegalBeneficiary;
+
+    /**
+     * 受益人列表信息
+     */
+    private List<ApiBeneficiaryInfoDto> apiBeneficiaryInfoDtoList;
+}

yd-csf-feign/src/main/java/com/yd/csf/feign/request/appointment/ApiAppointmentAddRequest.java

@@ -37,9 +37,10 @@ public class ApiAppointmentAddRequest {
     private ApiInsurantInfoDto apiInsurantInfoDto;
 
     /**
-     * 受益人列表信息
+     * 受益人封装对象
      */
-    private List<ApiBeneficiaryInfoDto> apiBeneficiaryInfoDtoList;
+    @Valid
+    private ApiBeneficiaryInfoFzDto apiBeneficiaryInfoFzDto;
 
     /**
      * 第二持有人信息

yd-csf-feign/src/main/java/com/yd/csf/feign/request/appointment/ApiAppointmentAddStorageRequest.java

@@ -2,6 +2,8 @@ package com.yd.csf.feign.request.appointment;
 
 import com.yd.csf.feign.dto.appointment.*;
 import lombok.Data;
+
+import javax.validation.Valid;
 import java.util.List;
 
 /**
@@ -31,9 +33,9 @@ public class ApiAppointmentAddStorageRequest {
     private ApiInsurantInfoDto apiInsurantInfoDto;
 
     /**
-     * 受益人列表信息
+     * 受益人封装对象
      */
-    private List<ApiBeneficiaryInfoDto> apiBeneficiaryInfoDtoList;
+    private ApiBeneficiaryInfoFzDto apiBeneficiaryInfoFzDto;
 
     /**
      * 第二持有人信息

yd-csf-feign/src/main/java/com/yd/csf/feign/request/appointment/ApiAppointmentEditRequest.java

@@ -42,9 +42,10 @@ public class ApiAppointmentEditRequest {
     private ApiInsurantInfoDto apiInsurantInfoDto;
 
     /**
-     * 受益人列表信息
+     * 受益人封装信息
      */
-    private List<ApiBeneficiaryInfoDto> apiBeneficiaryInfoDtoList;
+    @Valid
+    private ApiBeneficiaryInfoFzDto apiBeneficiaryInfoFzDto;
 
     /**
      * 第二持有人信息

yd-csf-feign/src/main/java/com/yd/csf/feign/request/appointment/ApiAppointmentEditStorageRequest.java

@@ -30,9 +30,9 @@ public class ApiAppointmentEditStorageRequest {
     private ApiInsurantInfoDto apiInsurantInfoDto;
 
     /**
-     * 受益人列表信息
+     * 受益人封装信息
      */
-    private List<ApiBeneficiaryInfoDto> apiBeneficiaryInfoDtoList;
+    private ApiBeneficiaryInfoFzDto apiBeneficiaryInfoFzDto;
 
     /**
      * 第二持有人信息

yd-csf-feign/src/main/java/com/yd/csf/feign/response/appointment/ApiAppointmentDetailResponse.java

@@ -41,9 +41,9 @@ public class ApiAppointmentDetailResponse {
     private ApiInsurantInfoDto apiInsurantInfoDto;
 
     /**
-     * 受益人列表信息
+     * 受益人封装信息
      */
-    private List<ApiBeneficiaryInfoDto> apiBeneficiaryInfoDtoList;
+    private ApiBeneficiaryInfoFzDto apiBeneficiaryInfoFzDto;
 
     /**
      * 第二持有人信息