Commit 9ca02d55 by zhangxingmin

push

parent dcece7bc
......@@ -20,9 +20,11 @@ import com.yd.product.feign.dto.ApiProjectDto;
import com.yd.product.feign.dto.ApiSpeciesPriceDto;
import com.yd.product.feign.dto.ApiSpeciesTypeDto;
import com.yd.product.feign.enums.ProductCommonEnum;
import com.yd.product.feign.request.announcementspecies.ApiAnnouncementSpeciesDetailPageRequest;
import com.yd.product.feign.request.product.ApiProductAddRequest;
import com.yd.product.feign.request.product.ApiProductEditRequest;
import com.yd.product.feign.request.productlaunch.*;
import com.yd.product.feign.response.announcementspecies.ApiAnnouncementSpeciesDetailPageResponse;
import com.yd.product.feign.response.productlaunch.ApiAttributeSettingDto;
import com.yd.product.feign.response.productlaunch.ApiProductLaunchCategoryAddResponse;
import com.yd.product.feign.response.productlaunch.ApiProductLaunchDetailResponse;
......@@ -84,6 +86,9 @@ public class ApiProductLaunchServiceImpl implements ApiProductLaunchService {
@Autowired
private ApiSysProjectFeignClient apiSysProjectFeignClient;
@Autowired
private ApiAnnouncementSpeciesService apiAnnouncementSpeciesService;
@Override
public Result<IPage<ApiProductLaunchPageResponse>> page(ApiProductLaunchPageRequest request) {
Page<ApiProductLaunchPageResponse> page = new Page<ApiProductLaunchPageResponse>(request.getPageNo(), request.getPageSize());
......@@ -220,7 +225,13 @@ public class ApiProductLaunchServiceImpl implements ApiProductLaunchService {
List<ApiSpeciesPriceDto> apiSpeciesPriceDtoList = apiSpeciesPriceService.querySpeciesPriceDtoList(productLaunchBizId);
response.setApiSpeciesPriceDtoList(apiSpeciesPriceDtoList);
//公告佣金明细
ApiAnnouncementSpeciesDetailPageRequest pageRequest = new ApiAnnouncementSpeciesDetailPageRequest();
pageRequest.setProductLaunchBizId(productLaunchBizId);
pageRequest.setPageNo(1);
pageRequest.setPageSize(999999);
Result<IPage<ApiAnnouncementSpeciesDetailPageResponse>> result = apiAnnouncementSpeciesService.page(pageRequest);
response.setSpeciesDetailPageResponseList(!Objects.isNull(result.getData()) && !CollectionUtils.isEmpty(result.getData().getRecords()) ? result.getData().getRecords() : new ArrayList<>());
return Result.success(response);
}
......
......@@ -3,6 +3,7 @@ package com.yd.product.feign.response.productlaunch;
import com.yd.product.feign.dto.ApiProductLaunchDto;
import com.yd.product.feign.dto.ApiSpeciesPriceDto;
import com.yd.product.feign.dto.ApiSpeciesTypeDto;
import com.yd.product.feign.response.announcementspecies.ApiAnnouncementSpeciesDetailPageResponse;
import lombok.Data;
import java.util.List;
......@@ -29,4 +30,8 @@ public class ApiProductLaunchDetailResponse {
*/
private List<ApiSpeciesPriceDto> apiSpeciesPriceDtoList;
/**
* 公告佣金明细列表
*/
private List<ApiAnnouncementSpeciesDetailPageResponse> speciesDetailPageResponseList;
}
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