新单跟进同步预约信息3

yd-csf-api/src/main/java/com/yd/csf/api/controller/ApiPolicyFollowController.java

@@ -712,15 +712,11 @@ public class ApiPolicyFollowController {
      */
     @GetMapping("/product_plan")
     @Operation(summary = "查询产品计划信息")
-    public Result<Policy> getProductPlan(@RequestParam("policyBizId") String policyBizId) {
+    public Result<PolicyDto> getProductPlan(@RequestParam("policyBizId") String policyBizId) {
         if (StringUtils.isBlank(policyBizId)) {
             return Result.fail(ResultCode.NULL_ERROR.getCode(), "policyBizId不能为空");
         }
-        Policy policy = policyFollowService.getProductPlan(policyBizId);
-        if (policy == null) {
-            return Result.fail(ResultCode.NULL_ERROR.getCode(), "产品计划信息不存在");
-        }
-        return Result.success(policy);
+        return Result.success(policyFollowService.getProductPlan(policyBizId));
     }
 
     /**

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

 package com.yd.csf.service.dto;
 
-import com.yd.csf.service.model.PolicyAdditional;
+import com.yd.csf.service.model.*;
 import com.yd.csf.service.vo.PolicyVO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import org.apache.commons.lang3.ObjectUtils;
 
 import java.io.Serializable;
 import java.util.List;
@@ -23,4 +24,19 @@ public class PolicyDto implements Serializable {
      */
     @Schema(description = "保单附加险列表")
     private List<PolicyAdditional> apiProductPlanAdditionalInfoDtoList;
+
+    public static PolicyDto convertToDto(Policy policy, List<PolicyAdditional> policyAdditionals) {
+        PolicyDto dto = new PolicyDto();
+        if (ObjectUtils.isEmpty(policy)) {
+            return dto;
+        }
+
+        // 产品计划主信息
+        dto.setApiProductPlanMainInfoDto(PolicyVO.objToVo(policy));
+
+        // 附加险列表
+        dto.setApiProductPlanAdditionalInfoDtoList(policyAdditionals);
+
+        return dto;
+    }
 }

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

@@ -96,7 +96,7 @@ public interface PolicyFollowService extends IService<PolicyFollow> {
      * @param policyBizId 新单跟进业务ID
      * @return 产品计划信息
      */
-    Policy getProductPlan(String policyBizId);
+    PolicyDto getProductPlan(String policyBizId);
 
     /**
      * 查询投保人信息

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

@@ -963,8 +963,13 @@ public class PolicyFollowServiceImpl extends ServiceImpl<PolicyFollowMapper, Pol
     }
 
     @Override
-    public Policy getProductPlan(String policyBizId) {
-        return policyService.getOne(new QueryWrapper<Policy>().eq("policy_biz_id", policyBizId).eq("is_deleted", 0));
+    public PolicyDto getProductPlan(String policyBizId) {
+        Policy policy = policyService.getOne(new QueryWrapper<Policy>().eq("policy_biz_id", policyBizId));
+        List<PolicyAdditional> policyAdditionalList = policyAdditionalService.lambdaQuery()
+                .eq(PolicyAdditional::getPolicyBizId, policyBizId)
+                .list();
+        // 转换为DTO
+        return PolicyDto.convertToDto(policy, policyAdditionalList);
     }
 
     @Override

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

@@ -53,7 +53,6 @@ public class PolicyServiceImpl extends ServiceImpl<PolicyMapper, Policy>
 
     @Resource
     private PolicyAdditionalService policyAdditionalService;
-
     @Resource
     private ApiRelProjectProductLaunchFeignClient apiRelProjectProductLaunchFeignClient;
 
@@ -148,7 +147,6 @@ public class PolicyServiceImpl extends ServiceImpl<PolicyMapper, Policy>
             policyAdditionalService.saveBatch(policyAdditionalList);
         }
 
-        policy.setUpdateTime(now);
         return true;
     }