diff --git a/waynboot-common/src/main/java/com/wayn/common/core/service/shop/impl/GoodsServiceImpl.java b/waynboot-common/src/main/java/com/wayn/common/core/service/shop/impl/GoodsServiceImpl.java index 8a4b975..1db456f 100644 --- a/waynboot-common/src/main/java/com/wayn/common/core/service/shop/impl/GoodsServiceImpl.java +++ b/waynboot-common/src/main/java/com/wayn/common/core/service/shop/impl/GoodsServiceImpl.java @@ -190,6 +190,6 @@ public class GoodsServiceImpl extends ServiceImpl implements @Override public R selectListPageByCateIds(Page page, List l2cateList) { - return R.success().add("data", goodsMapper.selectGoodsListPageByl2CateId(page, l2cateList).getRecords()); + return R.success().add("goods", goodsMapper.selectGoodsListPageByl2CateId(page, l2cateList).getRecords()); } } diff --git a/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/controller/CategoryController.java b/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/controller/CategoryController.java index 548ca71..9af291a 100644 --- a/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/controller/CategoryController.java +++ b/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/controller/CategoryController.java @@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import java.util.Arrays; import java.util.List; import java.util.Objects; import java.util.stream.Collectors; @@ -58,12 +59,23 @@ public class CategoryController extends BaseController { return success; } - @GetMapping("goods") - public R listGoodsByFirstCate(@RequestParam(defaultValue = "0") Long cateId) { + @GetMapping("firstCategoryGoods") + public R firstCateGoods(@RequestParam(defaultValue = "0") Long cateId) { Page page = getPage(); List categoryList = iCategoryService.list(new QueryWrapper().select("id").eq("pid", cateId)); List cateList = categoryList.stream().map(Category::getId).collect(Collectors.toList()); - return iGoodsService.selectListPageByCateIds(page, cateList); + R success = iGoodsService.selectListPageByCateIds(page, cateList); + success.add("category", iCategoryService.getById(cateId)); + return success; + } + + @GetMapping("secondCategoryGoods") + public R secondCateGoods(@RequestParam(defaultValue = "0") Long cateId) { + Page page = getPage(); + List cateList = Arrays.asList(cateId); + R success = iGoodsService.selectListPageByCateIds(page, cateList); + success.add("category", iCategoryService.getById(cateId)); + return success; }