From e616be7687a6d6a71febe9b6f440a5b72e0b20d6 Mon Sep 17 00:00:00 2001
From: wuchunlei <mailcauchy@gmail.com>
Date: Thu, 16 May 2024 13:21:37 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=A0=87=E7=AD=BE=E4=B8=8B?=
 =?UTF-8?q?=E5=BE=97=E5=95=86=E5=93=81=E4=B9=A6=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BookLabelAndMarketController.java         | 26 +++++++++++++++++++
 .../common/entity/ShopProductToBookLabel.java |  2 ++
 .../entity/ShopProductToBookMarket.java       |  2 ++
 3 files changed, 30 insertions(+)

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<ShopProductToBookLabel> 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<ShopProductToBookMarket> 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;
+
     /**
      * 创建时间
      */