Commit 502f9287 by zhangxingmin

push

parent 30e0adc3
...@@ -6,6 +6,9 @@ import com.yd.base.feign.client.relobjectcategory.ApiRelObjectCategoryFeignClien ...@@ -6,6 +6,9 @@ import com.yd.base.feign.client.relobjectcategory.ApiRelObjectCategoryFeignClien
import com.yd.base.feign.request.relobjectcategory.ApiRelObjectCategoryQueryRequest; import com.yd.base.feign.request.relobjectcategory.ApiRelObjectCategoryQueryRequest;
import com.yd.base.feign.response.relobjectcategory.ApiRelObjectCategoryQueryResponse; import com.yd.base.feign.response.relobjectcategory.ApiRelObjectCategoryQueryResponse;
import com.yd.common.result.Result; import com.yd.common.result.Result;
import com.yd.oss.feign.client.ApiOssFileFeignClient;
import com.yd.oss.feign.request.ApiOssFileListRequest;
import com.yd.oss.feign.response.ApiOssFileListResponse;
import com.yd.product.api.service.ApiAttributeSettingService; import com.yd.product.api.service.ApiAttributeSettingService;
import com.yd.product.api.service.ApiRelProjectProductLaunchService; import com.yd.product.api.service.ApiRelProjectProductLaunchService;
import com.yd.product.api.service.ApiSpeciesPriceService; import com.yd.product.api.service.ApiSpeciesPriceService;
...@@ -44,6 +47,9 @@ public class ApiRelProjectProductLaunchServiceImpl implements ApiRelProjectProdu ...@@ -44,6 +47,9 @@ public class ApiRelProjectProductLaunchServiceImpl implements ApiRelProjectProdu
@Autowired @Autowired
private ApiRelObjectCategoryFeignClient apiRelObjectCategoryFeignClient; private ApiRelObjectCategoryFeignClient apiRelObjectCategoryFeignClient;
@Autowired
private ApiOssFileFeignClient apiOssFileFeignClient;
/** /**
* 分页列表查询-租户项目产品上架关系信息 * 分页列表查询-租户项目产品上架关系信息
* @param request * @param request
...@@ -63,6 +69,12 @@ public class ApiRelProjectProductLaunchServiceImpl implements ApiRelProjectProdu ...@@ -63,6 +69,12 @@ public class ApiRelProjectProductLaunchServiceImpl implements ApiRelProjectProdu
queryRequest.setObjectBizIdList(productLaunchBizIdList); queryRequest.setObjectBizIdList(productLaunchBizIdList);
Result<List<ApiRelObjectCategoryQueryResponse>> result = apiRelObjectCategoryFeignClient.query(queryRequest); Result<List<ApiRelObjectCategoryQueryResponse>> result = apiRelObjectCategoryFeignClient.query(queryRequest);
List<ApiRelObjectCategoryQueryResponse> categoryQueryResponses = result.getData(); List<ApiRelObjectCategoryQueryResponse> categoryQueryResponses = result.getData();
ApiOssFileListRequest fileListRequest = new ApiOssFileListRequest();
fileListRequest.setObjectBizIdList(productLaunchBizIdList);
Result<List<ApiOssFileListResponse>> listResult = apiOssFileFeignClient.list(fileListRequest);
List<ApiOssFileListResponse> fileListResponses = listResult.getData();
for (ApiRelProjectProductLaunchPageResponse response : responses) { for (ApiRelProjectProductLaunchPageResponse response : responses) {
//设置的产品上架信息的参数列表 //设置的产品上架信息的参数列表
List<ApiAttributeSettingDto> apiAttributeSettingDtoList = apiAttributeSettingService.queryAttributeSettingDtoList(response.getProductLaunchBizId()); List<ApiAttributeSettingDto> apiAttributeSettingDtoList = apiAttributeSettingService.queryAttributeSettingDtoList(response.getProductLaunchBizId());
...@@ -85,6 +97,15 @@ public class ApiRelProjectProductLaunchServiceImpl implements ApiRelProjectProdu ...@@ -85,6 +97,15 @@ public class ApiRelProjectProductLaunchServiceImpl implements ApiRelProjectProdu
.collect(Collectors.toList()); .collect(Collectors.toList());
response.setCategoryQueryResponseList(categoryQueryResponseList); response.setCategoryQueryResponseList(categoryQueryResponseList);
} }
//设置产品文件列表
if (!CollectionUtils.isEmpty(fileListResponses)) {
List<ApiOssFileListResponse> fileListResponseList = fileListResponses
.stream()
.filter(dto -> dto.getObjectBizId().equals(response.getProductLaunchBizId()))
.collect(Collectors.toList());
response.setFileListResponseList(fileListResponseList);
}
} }
iPage.setRecords(responses); iPage.setRecords(responses);
} }
......
...@@ -31,5 +31,10 @@ ...@@ -31,5 +31,10 @@
<artifactId>yd-base-feign</artifactId> <artifactId>yd-base-feign</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency>
<groupId>com.yd</groupId>
<artifactId>yd-oss-feign</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies> </dependencies>
</project> </project>
\ No newline at end of file
package com.yd.product.feign.response.relprojectproductlaunch; package com.yd.product.feign.response.relprojectproductlaunch;
import com.yd.base.feign.response.relobjectcategory.ApiRelObjectCategoryQueryResponse; import com.yd.base.feign.response.relobjectcategory.ApiRelObjectCategoryQueryResponse;
import com.yd.oss.feign.response.ApiOssFileListResponse;
import com.yd.product.feign.dto.ApiSpeciesPriceDto; import com.yd.product.feign.dto.ApiSpeciesPriceDto;
import com.yd.product.feign.dto.ApiSpeciesTypeDto; import com.yd.product.feign.dto.ApiSpeciesTypeDto;
import com.yd.product.feign.response.productlaunch.ApiAttributeSettingDto; import com.yd.product.feign.response.productlaunch.ApiAttributeSettingDto;
...@@ -89,4 +90,9 @@ public class ApiRelProjectProductLaunchPageResponse { ...@@ -89,4 +90,9 @@ public class ApiRelProjectProductLaunchPageResponse {
* 产品上架绑定的分类列表 * 产品上架绑定的分类列表
*/ */
private List<ApiRelObjectCategoryQueryResponse> categoryQueryResponseList; private List<ApiRelObjectCategoryQueryResponse> categoryQueryResponseList;
/**
* 上架产品文件列表
*/
private List<ApiOssFileListResponse> fileListResponseList;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment