|
@@ -27,12 +27,16 @@ public class CdfProductController {
|
|
@RequestMapping("/list")
|
|
@RequestMapping("/list")
|
|
public ResultData getProductList(@RequestBody CdfProductListRequest param){
|
|
public ResultData getProductList(@RequestBody CdfProductListRequest param){
|
|
if(StringUtils.isNotBlank(param.getKeyword()) && param.getKeyword().contains(",")){
|
|
if(StringUtils.isNotBlank(param.getKeyword()) && param.getKeyword().contains(",")){
|
|
|
|
+ if(param.getPageNum() >1){
|
|
|
|
+ PageInfo pageInfo = PageInfo.PageInfo(param.getPageIndex(), 20L, 0L, new ArrayList<>());
|
|
|
|
+ return ResultData.ok(pageInfo);
|
|
|
|
+ }
|
|
JSONArray ids = new JSONArray();
|
|
JSONArray ids = new JSONArray();
|
|
ids.addAll(Arrays.asList(param.getKeyword().split(",")));
|
|
ids.addAll(Arrays.asList(param.getKeyword().split(",")));
|
|
CdfProductListByIdsRequest idsRequest = new CdfProductListByIdsRequest(ids);
|
|
CdfProductListByIdsRequest idsRequest = new CdfProductListByIdsRequest(ids);
|
|
CdfProductListByIdsVo vos = cdfClient.getProductListByIds(idsRequest);
|
|
CdfProductListByIdsVo vos = cdfClient.getProductListByIds(idsRequest);
|
|
List<CdfProduct> productCardList = vos.getProductCardList();
|
|
List<CdfProduct> productCardList = vos.getProductCardList();
|
|
- PageInfo pageInfo = PageInfo.PageInfo(param.getPageIndex(), 20L, (long) productCardList.size(), productCardList);
|
|
|
|
|
|
+ PageInfo pageInfo = PageInfo.PageInfo(param.getPageIndex(), (long) productCardList.size(), (long) productCardList.size(), productCardList);
|
|
return ResultData.ok(pageInfo);
|
|
return ResultData.ok(pageInfo);
|
|
}
|
|
}
|
|
CdfProductListResponse productList = cdfClient.getProductList(param);
|
|
CdfProductListResponse productList = cdfClient.getProductList(param);
|