push

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

@@ -5,7 +5,6 @@ import lombok.Data;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotBlank;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
-import java.util.Date;
 
 
 /**
 /**
  * 产品计划主信息
  * 产品计划主信息
@@ -19,19 +18,14 @@ public class ApiProductPlanMainInfoDto {
     private String planBizId;
     private String planBizId;
 
 
     /**
     /**
-     * 新单跟进信息表唯一业务ID
+     * 保险公司ID（产品上架信息绑定的保险公司参数）
      */
      */
-    private String policyBizId;
+    private String companyId;
 
 
     /**
     /**
-     * 保险公司
+     * 保险公司名称
      */
      */
-    private String insuranceCompany;
-
-    /**
-     * 保险公司业务id
-     */
-    private String insuranceCompanyBizId;
+    private String companyName;
 
 
     /**
     /**
      * 出单经纪公司（对账公司）ID
      * 出单经纪公司（对账公司）ID
@@ -128,8 +122,8 @@ public class ApiProductPlanMainInfoDto {
     /**
     /**
      * 回溯日期
      * 回溯日期
      */
      */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date retroactiveDate;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime backtrackDate;
 
 
     /**
     /**
      * 是否参加递增保障权益: 0-否, 1-是（字典）
      * 是否参加递增保障权益: 0-否, 1-是（字典）

yd-csf-service/src/main/java/com/yd/csf/service/service/impl/PolicyServiceImpl.java

@@ -35,6 +35,7 @@ import org.springframework.util.CollectionUtils;
 import javax.annotation.Resource;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.math.RoundingMode;
+import java.time.ZoneId;
 import java.util.*;
 import java.util.*;
 import java.util.function.Function;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
@@ -145,6 +146,8 @@ public class PolicyServiceImpl extends ServiceImpl<PolicyMapper, Policy>
         policy.setIsPrepaid(apiProductPlanMainInfoDto.getIsPrepay());
         policy.setIsPrepaid(apiProductPlanMainInfoDto.getIsPrepay());
         policy.setPrepaidTerm(apiProductPlanMainInfoDto.getPrepaymentPeriod());
         policy.setPrepaidTerm(apiProductPlanMainInfoDto.getPrepaymentPeriod());
         policy.setIsBacktrack(apiProductPlanMainInfoDto.getIsTraceable());
         policy.setIsBacktrack(apiProductPlanMainInfoDto.getIsTraceable());
+        policy.setInsuranceCompany(apiProductPlanMainInfoDto.getCompanyName());
+        policy.setInsuranceCompanyBizId(apiProductPlanMainInfoDto.getCompanyId());
         // 更新保单
         // 更新保单
         this.updateById(policy);
         this.updateById(policy);
         //更新新单跟进数据
         //更新新单跟进数据
@@ -160,7 +163,17 @@ public class PolicyServiceImpl extends ServiceImpl<PolicyMapper, Policy>
         policyFollow.setInsuranceCategoryBizId(apiProductPlanMainInfoDto.getInsuranceTypeId());
         policyFollow.setInsuranceCategoryBizId(apiProductPlanMainInfoDto.getInsuranceTypeId());
         policyFollow.setProductName(apiProductPlanMainInfoDto.getProductLaunchMainName());
         policyFollow.setProductName(apiProductPlanMainInfoDto.getProductLaunchMainName());
         policyFollow.setPrepaidTerm(apiProductPlanMainInfoDto.getIsPrepay());
         policyFollow.setPrepaidTerm(apiProductPlanMainInfoDto.getIsPrepay());
-        policyFollow.setRetroactiveDate(apiProductPlanMainInfoDto.getRetroactiveDate());
+        policyFollow.setInsuranceCompanyBizId(apiProductPlanMainInfoDto.getCompanyId());
+        policyFollow.setInsuranceCompany(apiProductPlanMainInfoDto.getCompanyName());
+        if (apiProductPlanMainInfoDto.getBacktrackDate() != null) {
+            policyFollow.setRetroactiveDate(
+                    Date.from(apiProductPlanMainInfoDto.getBacktrackDate()
+                            .atZone(ZoneId.systemDefault())
+                            .toInstant())
+            );
+        } else {
+            policyFollow.setRetroactiveDate(null);
+        }
 
 
 //        // 先删除旧的附加险
 //        // 先删除旧的附加险
 //        policyAdditionalService.remove(new QueryWrapper<PolicyAdditional>().eq("policy_biz_id", policyBizId));
 //        policyAdditionalService.remove(new QueryWrapper<PolicyAdditional>().eq("policy_biz_id", policyBizId));