新单跟进138

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

@@ -493,8 +493,12 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService {
         // 用户业务员id
         // 用户业务员id
         follow.setUserBizId(appointment.getCreatorId());
         follow.setUserBizId(appointment.getCreatorId());
         if (!Objects.isNull(apiInsurantInfoDto)) {
         if (!Objects.isNull(apiInsurantInfoDto)) {
-            //受保人
+            // 受保人
             follow.setInsured(apiInsurantInfoDto.getName());
             follow.setInsured(apiInsurantInfoDto.getName());
+            // 受保人与保單持有人关系
+            if ("MYSELF".equals(apiInsurantInfoDto.getPolicyholderRel())) {
+                follow.setInsured(follow.getPolicyHolder());
+            }
         }
         }
 
 
         if (!Objects.isNull(apiProductPlanMainInfoDto)) {
         if (!Objects.isNull(apiProductPlanMainInfoDto)) {

yd-csf-service/src/main/java/com/yd/csf/service/dto/PolicyUpdateRequest.java

 package com.yd.csf.service.dto;
 package com.yd.csf.service.dto;
 
 
 import com.yd.csf.feign.dto.appointment.ApiProductPlanAdditionalInfoDto;
 import com.yd.csf.feign.dto.appointment.ApiProductPlanAdditionalInfoDto;
+import com.yd.csf.feign.dto.appointment.ApiProductPlanMainInfoDto;
 import com.yd.csf.service.model.Policy;
 import com.yd.csf.service.model.Policy;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.Data;
@@ -22,7 +23,7 @@ public class PolicyUpdateRequest implements Serializable {
      * 产品计划(保单信息)
      * 产品计划(保单信息)
      */
      */
     @Schema(description = "产品计划(保单信息)")
     @Schema(description = "产品计划(保单信息)")
-    private Policy apiProductPlanMainInfoDto;
+    private ApiProductPlanMainInfoDto apiProductPlanMainInfoDto;
 
 
     /**
     /**
      * 保单附加险列表
      * 保单附加险列表

yd-csf-service/src/main/java/com/yd/csf/service/service/CommissionAsyncService.java

@@ -204,7 +204,7 @@ public class CommissionAsyncService {
             // 对应预计来佣设置为已来佣
             // 对应预计来佣设置为已来佣
             commissionExpected.setStatus(CommissionExpectedStatusEnum.COMPARED.getItemValue());
             commissionExpected.setStatus(CommissionExpectedStatusEnum.COMPARED.getItemValue());
             // 待入账金额设置为 0
             // 待入账金额设置为 0
-            commissionExpected.setPaidAmount(paidAmount.setScale(2, RoundingMode.HALF_UP));
+            commissionExpected.setPaidAmount(paidAmount.setScale(4, RoundingMode.HALF_UP));
             commissionExpected.setPaidRatio(paidRatio);
             commissionExpected.setPaidRatio(paidRatio);
             // 更新预计来佣
             // 更新预计来佣
             commissionExpectedService.updateById(commissionExpected);
             commissionExpectedService.updateById(commissionExpected);

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

@@ -293,7 +293,7 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
             if ("USD".equals(one.getCurrency())) {
             if ("USD".equals(one.getCurrency())) {
                 expectedAmount = expectedAmount.multiply(one.getDefaultExchangeRate());
                 expectedAmount = expectedAmount.multiply(one.getDefaultExchangeRate());
             }
             }
-            one.setExpectedAmount(expectedAmount.divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP));
+            one.setExpectedAmount(expectedAmount.divide(BigDecimal.valueOf(100), 4, RoundingMode.HALF_UP));
         }
         }
         return one;
         return one;
     }
     }