diff --git a/src/main/java/com/peanut/modules/book/controller/BookLabelAndMarketController.java b/src/main/java/com/peanut/modules/book/controller/BookLabelAndMarketController.java index 23e0e580..b48b5b19 100644 --- a/src/main/java/com/peanut/modules/book/controller/BookLabelAndMarketController.java +++ b/src/main/java/com/peanut/modules/book/controller/BookLabelAndMarketController.java @@ -352,7 +352,33 @@ public class BookLabelAndMarketController { return R.ok(); } + /** + * 获取分类标签下得商品列表 + */ + @RequestMapping("/getShopProductListByLabelId") + public R getShopProductListByLabelId(String labelId){ + MPJLambdaWrapper wrapper = new MPJLambdaWrapper(); + wrapper.eq(ShopProductToBookLabel::getBookLabelId,labelId); + wrapper.leftJoin(ShopProduct.class,ShopProduct::getProductId,ShopProductToBookLabel::getProductId); + wrapper.selectAll(ShopProduct.class); + wrapper.orderByAsc(ShopProductToBookLabel::getSort); + List list = toLabelService.listMaps(wrapper); + return R.ok().put("result", list); + } + /** + * 获取营销标签下得商品列表 + */ + @RequestMapping("/getShopProductListByMarketId") + public R getShopProductListByMarketId(String marketId){ + MPJLambdaWrapper wrapper = new MPJLambdaWrapper(); + wrapper.eq(ShopProductToBookMarket::getBookMarketId,marketId); + wrapper.leftJoin(ShopProduct.class,ShopProduct::getProductId,ShopProductToBookMarket::getProductId); + wrapper.selectAll(ShopProduct.class); + wrapper.orderByAsc(ShopProductToBookMarket::getSort); + List list = toMarketService.listMaps(wrapper); + return R.ok().put("result", list); + } diff --git a/src/main/java/com/peanut/modules/common/entity/ShopProductToBookLabel.java b/src/main/java/com/peanut/modules/common/entity/ShopProductToBookLabel.java index 2cee2ba1..925e3d49 100644 --- a/src/main/java/com/peanut/modules/common/entity/ShopProductToBookLabel.java +++ b/src/main/java/com/peanut/modules/common/entity/ShopProductToBookLabel.java @@ -23,6 +23,8 @@ public class ShopProductToBookLabel implements Serializable { private Integer bookLabelId; + private Integer sort; + /** * 创建时间 */ diff --git a/src/main/java/com/peanut/modules/common/entity/ShopProductToBookMarket.java b/src/main/java/com/peanut/modules/common/entity/ShopProductToBookMarket.java index 41937587..ea0486e9 100644 --- a/src/main/java/com/peanut/modules/common/entity/ShopProductToBookMarket.java +++ b/src/main/java/com/peanut/modules/common/entity/ShopProductToBookMarket.java @@ -21,6 +21,8 @@ public class ShopProductToBookMarket implements Serializable { private Integer bookMarketId; + private Integer sort; + /** * 创建时间 */