新单跟进v2

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

@@ -490,38 +490,17 @@ public class ApiPolicyFollowController {
      */
     @GetMapping("/get/vo")
     @Operation(summary = "根据 policyBizId 获取新单跟进详情")
-    public Result<PolicyFollowVO> getPolicyFollowByPolicyBizId(@RequestParam("policyBizId") String policyBizId, HttpServletRequest request) {
+    public Result<PolicyFollowDetailVO> getPolicyFollowByPolicyBizId(@RequestParam("policyBizId") String policyBizId, HttpServletRequest request) {
         if (StringUtils.isBlank(policyBizId)) {
             return Result.fail(ErrorCode.PARAMS_ERROR.getCode(), "policyBizId不能为空");
         }
-        // 查询数据库
-        PolicyFollow policyFollow = policyFollowService.getByPolicyBizId(policyBizId);
-        if (policyFollow == null) {
+        // 查询数据库并组装详情数据（包含附加险和介绍人）
+        PolicyFollowDetailVO detailVO = policyFollowService.getPolicyFollowDetailVO(policyBizId);
+        if (detailVO == null) {
             return Result.fail(ErrorCode.NOT_FOUND_ERROR.getCode(), ErrorCode.NOT_FOUND_ERROR.getMessage());
         }
-        // 异步查询产品上架信息表
-        if (StringUtils.isNotBlank(policyFollow.getPolicyNo()) && StringUtils.isBlank(policyFollow.getProductLaunchBizId())) {
-            // 异步查询产品上架信息表
-//            ApiExpectedCommissionRatioPageRequest apiExpectedCommissionRatioPageRequest = new ApiExpectedCommissionRatioPageRequest();
-//            apiExpectedCommissionRatioPageRequest.setPageNo(1);
-//            apiExpectedCommissionRatioPageRequest.setPageSize(100);
-//            apiExpectedCommissionRatioPageRequest.setWarrantyPeriod(String.valueOf(policyFollow.getPaymentTerm()));
-//            Result<Page<ApiExpectedCommissionRatioPageResponse>> result = apiExpectedCommissionRatioFeignClient.page(apiExpectedCommissionRatioPageRequest);
-//            if (result != null && result.getData() != null) {
-//                List<ApiExpectedCommissionRatioPageResponse> records = (List<ApiExpectedCommissionRatioPageResponse>) result.getData();
-//                if (CollectionUtils.isNotEmpty(records)) {
-//                    policyFollow.setProductLaunchBizId(records.get(0).getProductLaunchBizId());
-//                }
-//            }
-            PolicyFollow updatePolicyFollow = new PolicyFollow();
-            updatePolicyFollow.setId(policyFollow.getId());
-            updatePolicyFollow.setProductLaunchBizId("product_launch_kudwRqXsz1");
-            policyFollowService.updateById(updatePolicyFollow);
-        }
-
-
         // 获取封装类
-        return Result.success(policyFollowService.getPolicyFollowVO(policyFollow));
+        return Result.success(detailVO);
     }
 
     /**

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.yd.csf.service.dto.*;
 import com.yd.csf.service.enums.PolicyFollowStatusEnum;
 import com.yd.csf.service.model.PolicyFollow;
+import com.yd.csf.service.vo.PolicyFollowDetailVO;
 import com.yd.csf.service.vo.PolicyFollowVO;
 
 import java.util.List;
@@ -40,6 +41,11 @@ public interface PolicyFollowService extends IService<PolicyFollow> {
      */
     Map<String, Object> addPolicyFollowDto(PolicyFollowDto policyFollowDto);
 
+    /**
+     * 获取新单跟进详情（包含附加险和介绍人）
+     */
+    PolicyFollowDetailVO getPolicyFollowDetailVO(String policyBizId);
+
     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

@@ -22,6 +22,7 @@ import com.yd.csf.service.service.*;
 import com.yd.csf.service.dao.PolicyFollowMapper;
 import com.yd.csf.service.utils.AsyncQueryUtil;
 import com.yd.csf.service.utils.GSONUtil;
+import com.yd.csf.service.vo.PolicyFollowDetailVO;
 import com.yd.csf.service.vo.PolicyFollowVO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
@@ -310,6 +311,39 @@ public class PolicyFollowServiceImpl extends ServiceImpl<PolicyFollowMapper, Pol
         return Collections.singletonMap("policyBizId", policyBizId);
     }
 
+    @Override
+    public PolicyFollowDetailVO getPolicyFollowDetailVO(String policyBizId) {
+        if (StringUtils.isBlank(policyBizId)) {
+            return null;
+        }
+        // 查询主表
+        PolicyFollow policyFollow = getByPolicyBizId(policyBizId);
+        if (policyFollow == null) {
+            return null;
+        }
+
+        // 转换为 DetailVO
+        PolicyFollowDetailVO detailVO = PolicyFollowDetailVO.objToVo(policyFollow);
+
+        // 查询介绍人列表
+        List<PolicyBroker> brokerList = policyBrokerService.list(
+                new QueryWrapper<PolicyBroker>()
+                        .eq("policy_biz_id", policyBizId)
+                        .eq("is_deleted", 0)
+        );
+        detailVO.setBrokerList(brokerList);
+
+        // 查询附加险列表
+        List<PolicyAdditional> additionalList = policyAdditionalService.list(
+                new QueryWrapper<PolicyAdditional>()
+                        .eq("policy_biz_id", policyBizId)
+                        .eq("is_deleted", 0)
+        );
+        detailVO.setAdditionalList(additionalList);
+
+        return detailVO;
+    }
+
 
     @Override
      public Boolean addToPolicy(List<String> policyNoList) {
@@ -634,7 +668,7 @@ public class PolicyFollowServiceImpl extends ServiceImpl<PolicyFollowMapper, Pol
             throw new BusinessException(ResultCode.NULL_ERROR.getCode(), "新单跟进记录不存在");
         }
 
-        if (org.apache.commons.collections4.CollectionUtils.isEmpty(brokerBatchSaveRequest.getBrokerList())) {
+        if (CollectionUtils.isEmpty(brokerBatchSaveRequest.getBrokerList())) {
             throw new BusinessException(ResultCode.PARAMS_ERROR.getCode(), "介绍人列表不能为空");
         }