Commit 93af2bd9 by zhangxingmin

push

parent b0673f13
......@@ -2,9 +2,12 @@ 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.field.ApiFieldFeignClient;
import com.yd.base.feign.client.relobjectcategory.ApiRelObjectCategoryFeignClient;
import com.yd.base.feign.request.field.ApiFieldListRequest;
import com.yd.base.feign.request.relobjectcategory.ApiRelObjectCategoryListAddRequest;
import com.yd.base.feign.request.relobjectcategory.ApiRelObjectCategoryQueryRequest;
import com.yd.base.feign.response.field.ApiFieldDetailResponse;
import com.yd.base.feign.response.relobjectcategory.ApiRelObjectCategoryQueryResponse;
import com.yd.common.enums.CommonEnum;
import com.yd.common.enums.NoYesEnum;
......@@ -71,6 +74,9 @@ public class ApiProductLaunchServiceImpl implements ApiProductLaunchService {
@Autowired
private ApiRelTenantProjectFeignClient apiRelTenantProjectFeignClient;
@Autowired
private ApiFieldFeignClient apiFieldFeignClient;
@Override
public Result<IPage<ApiProductLaunchPageResponse>> page(ApiProductLaunchPageRequest request) {
Page<ApiProductLaunchPageResponse> page = new Page<ApiProductLaunchPageResponse>(request.getPageNo(), request.getPageSize());
......@@ -168,6 +174,26 @@ public class ApiProductLaunchServiceImpl implements ApiProductLaunchService {
//设置的产品上架信息的参数列表
List<ApiAttributeSettingDto> apiAttributeSettingDtoList = apiAttributeSettingService.queryAttributeSettingDtoList(productLaunchBizId);
if (!CollectionUtils.isEmpty(apiAttributeSettingDtoList)) {
List<String> fieldBizIdList = apiAttributeSettingDtoList.stream()
.map(ApiAttributeSettingDto::getFieldBizId).collect(Collectors.toList());
ApiFieldListRequest apiFieldListRequest = new ApiFieldListRequest();
apiFieldListRequest.setFieldBizIdList(fieldBizIdList);
Result<List<ApiFieldDetailResponse>> result = apiFieldFeignClient.list(apiFieldListRequest);
List<ApiFieldDetailResponse> detailResponses = result.getData();
apiAttributeSettingDtoList.stream().map(dto -> {
if (CollectionUtils.isEmpty(detailResponses)) {
dto.setTextBoxType("");
}else {
List<ApiFieldDetailResponse> responses = detailResponses.stream().filter(d -> d.getFieldBizId().equals(dto.getFieldBizId())).collect(Collectors.toList());
if (!CollectionUtils.isEmpty(responses)) {
ApiFieldDetailResponse response1 = responses.get(0);
dto.setTextBoxType(response1.getTextBoxType());
}
}
return dto;
}).collect(Collectors.toList());
}
response.setApiAttributeSettingDtoList(apiAttributeSettingDtoList);
//规格信息配置列表
......
......@@ -51,6 +51,7 @@ public class ApiSpeciesSettingServiceImpl implements ApiSpeciesSettingService {
}).collect(Collectors.toList());
iSpeciesSettingService.saveOrUpdateBatch(speciesSettingList);
}
return Result.success();
}
......
......@@ -44,4 +44,9 @@ public class ApiAttributeSettingDto {
* 通用备注
*/
private String remark;
/**
* 文本框类型
*/
private String textBoxType;
}
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