push

yd-product-api/src/main/java/com/yd/product/api/service/impl/ApiRelProjectProductLaunchServiceImpl.java

@@ -2,6 +2,9 @@ package com.yd.product.api.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yd.base.feign.client.relobjectcategory.ApiRelObjectCategoryFeignClient;
+import com.yd.base.feign.request.relobjectcategory.ApiRelObjectCategoryQueryRequest;
+import com.yd.base.feign.response.relobjectcategory.ApiRelObjectCategoryQueryResponse;
 import com.yd.common.result.Result;
 import com.yd.product.api.service.ApiAttributeSettingService;
 import com.yd.product.api.service.ApiRelProjectProductLaunchService;
@@ -20,6 +23,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Slf4j
 @Service
@@ -37,6 +41,9 @@ public class ApiRelProjectProductLaunchServiceImpl implements ApiRelProjectProdu
     @Autowired
     private ApiSpeciesPriceService apiSpeciesPriceService;
 
+    @Autowired
+    private ApiRelObjectCategoryFeignClient apiRelObjectCategoryFeignClient;
+
     /**
      * 分页列表查询-租户项目产品上架关系信息
      * @param request
@@ -78,6 +85,15 @@ public class ApiRelProjectProductLaunchServiceImpl implements ApiRelProjectProdu
         IPage<ApiProductLaunchParameterPageResponse> iPage = iRelProjectProductLaunchService.parameterPage(page, request);
         if (!CollectionUtils.isEmpty(iPage.getRecords())) {
             List<ApiProductLaunchParameterPageResponse> responses = iPage.getRecords();
+            List<String> productLaunchBizIdList = responses.stream()
+                    .map(ApiProductLaunchParameterPageResponse::getProductLaunchBizId)
+                    .collect(Collectors.toList());
+            //查询-对象分类关系列表
+            ApiRelObjectCategoryQueryRequest queryRequest = new ApiRelObjectCategoryQueryRequest();
+            queryRequest.setObjectBizIdList(productLaunchBizIdList);
+            Result<List<ApiRelObjectCategoryQueryResponse>> result = apiRelObjectCategoryFeignClient.query(queryRequest);
+            List<ApiRelObjectCategoryQueryResponse> categoryQueryResponses = result.getData();
+
             for (ApiProductLaunchParameterPageResponse response : responses) {
                 //设置的产品上架信息的参数列表
                 List<ApiAttributeSettingDto> apiAttributeSettingDtoList = apiAttributeSettingService.queryAttributeSettingDtoList(response.getProductLaunchBizId());
@@ -91,6 +107,15 @@ public class ApiRelProjectProductLaunchServiceImpl implements ApiRelProjectProdu
                 //规格价格配置列表
                 List<ApiSpeciesPriceDto> apiSpeciesPriceDtoList = apiSpeciesPriceService.querySpeciesPriceDtoList(response.getProductLaunchBizId());
                 response.setApiSpeciesPriceDtoList(apiSpeciesPriceDtoList);
+
+                //设置分类列表（产品险种列表）
+                if (!CollectionUtils.isEmpty(categoryQueryResponses)) {
+                    List<ApiRelObjectCategoryQueryResponse> categoryQueryResponseList = categoryQueryResponses
+                            .stream()
+                            .filter(dto -> dto.getObjectBizId().equals(response.getProductLaunchBizId()))
+                            .collect(Collectors.toList());
+                    response.setCategoryQueryResponseList(categoryQueryResponseList);
+                }
             }
             iPage.setRecords(responses);
         }

yd-product-feign/src/main/java/com/yd/product/feign/response/relprojectproductlaunch/ApiProductLaunchParameterPageResponse.java

 package com.yd.product.feign.response.relprojectproductlaunch;
 
+import com.yd.base.feign.response.relobjectcategory.ApiRelObjectCategoryQueryResponse;
 import com.yd.product.feign.dto.ApiSpeciesPriceDto;
 import com.yd.product.feign.dto.ApiSpeciesTypeDto;
 import com.yd.product.feign.response.productlaunch.ApiAttributeSettingDto;
@@ -84,4 +85,9 @@ public class ApiProductLaunchParameterPageResponse {
      * 规格价格配置列表
      */
     private List<ApiSpeciesPriceDto> apiSpeciesPriceDtoList;
+
+    /**
+     * 产品上架绑定的分类列表
+     */
+    private List<ApiRelObjectCategoryQueryResponse> categoryQueryResponseList;
 }

yd-product-service/src/main/java/com/yd/product/service/model/ExpectedCommissionRatio.java

@@ -110,7 +110,6 @@ public class ExpectedCommissionRatio implements Serializable {
     @TableField("is_direct_sign")
     private String isDirectSign;
 
-
     /**
      * 对账公司id(部门id)
      */