From 945803adb0a49e03f6b5119ab6daad1b9eee90d3 Mon Sep 17 00:00:00 2001 From: xuwenbo <717567226@qq.com> Date: Fri, 31 Jul 2020 10:23:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E6=90=9C=E7=B4=A2=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=88=86=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../product/service/dto/YxStoreProductQueryCriteria.java | 3 +++ .../modules/product/rest/StoreProductController.java | 9 ++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/yshop-mall/src/main/java/co/yixiang/modules/product/service/dto/YxStoreProductQueryCriteria.java b/yshop-mall/src/main/java/co/yixiang/modules/product/service/dto/YxStoreProductQueryCriteria.java index ea4e36df..7a6dda61 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/product/service/dto/YxStoreProductQueryCriteria.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/product/service/dto/YxStoreProductQueryCriteria.java @@ -25,4 +25,7 @@ public class YxStoreProductQueryCriteria{ @Query private Integer isShow; + + @Query + private Integer cateId; } diff --git a/yshop-shop/src/main/java/co/yixiang/modules/product/rest/StoreProductController.java b/yshop-shop/src/main/java/co/yixiang/modules/product/rest/StoreProductController.java index ab63249d..c9662db5 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/product/rest/StoreProductController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/product/rest/StoreProductController.java @@ -77,7 +77,14 @@ public class StoreProductController { @GetMapping(value = "/yxStoreProduct") @PreAuthorize("hasAnyRole('admin','YXSTOREPRODUCT_ALL','YXSTOREPRODUCT_SELECT')") public ResponseEntity getYxStoreProducts(YxStoreProductQueryCriteria criteria, Pageable pageable){ - return new ResponseEntity<>(yxStoreProductService.queryAll(criteria,pageable),HttpStatus.OK); + //商品分类 + List storeCategories = yxStoreCategoryService.lambdaQuery() + .eq(YxStoreCategory::getIsShow, ShopCommonEnum.SHOW_1.getValue()) + .list(); + List> cateList = new ArrayList<>(); + Map queryAll = yxStoreProductService.queryAll(criteria, pageable); + queryAll.put("cateList", this.makeCate(storeCategories,cateList,0,1)); + return new ResponseEntity<>(queryAll,HttpStatus.OK); } @ForbidSubmit