From 98b9b7aaa33680cd5965e42a68e65cf3aaade3ea Mon Sep 17 00:00:00 2001
From: hequan_waynaqua <1669738430@qq.com>
Date: Mon, 24 Aug 2020 11:05:59 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=89=8B=E6=9C=BA=E7=AB=AF):=20=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E5=88=97=E8=A1=A8=20=E6=B7=BB=E5=8A=A0=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E5=9B=BE=E7=89=87=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/shop/impl/GoodsServiceImpl.java    |  2 +-
 .../api/controller/CategoryController.java     | 18 +++++++++++++++---
 2 files changed, 16 insertions(+), 4 deletions(-)

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<GoodsMapper, Goods> implements
 
     @Override
     public R selectListPageByCateIds(Page<Goods> page, List<Long> 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<Goods> page = getPage();
         List<Category> categoryList = iCategoryService.list(new QueryWrapper<Category>().select("id").eq("pid", cateId));
         List<Long> 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<Goods> page = getPage();
+        List<Long> cateList = Arrays.asList(cateId);
+        R success = iGoodsService.selectListPageByCateIds(page, cateList);
+        success.add("category", iCategoryService.getById(cateId));
+        return success;
     }