Merge branch 'master' of https://gitee.com/zouxuan/mec

mec-web/src/main/java/com/ym/mec/web/controller/GoodsCategoryController.java

@@ -2,6 +2,8 @@ package com.ym.mec.web.controller;
 
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.web.dal.entity.GoodsCategory;
+import com.ym.mec.web.dal.page.GoodsCategoryQueryInfo;
+import com.ym.mec.web.dal.page.GoodsQueryInfo;
 import com.ym.mec.web.service.GoodsCategoryService;
 import com.ym.mec.web.service.GoodsService;
 import io.swagger.annotations.*;
@@ -50,6 +52,14 @@ public class GoodsCategoryController extends BaseController {
         return succeed();
     }
 
+    @ApiOperation(value = "分页查询商品分类列表")
+    @PostMapping("/queryPage")
+    public Object queryPage(GoodsCategoryQueryInfo queryInfo) {
+        queryInfo.setParentId(-1);
+        return succeed(GoodsCategoryCategoryService.queryPage(queryInfo));
+    }
+
+
     @ApiOperation(value = "根据商品分类编号查询商品分类")
     @GetMapping("/get/{id}")
     public Object get(@ApiParam(value = "商品分类编号", required = true) @PathVariable("id") Integer id) {

mec-web/src/main/java/com/ym/mec/web/dal/page/GoodsCategoryQueryInfo.java

@@ -0,0 +1,30 @@
+package com.ym.mec.web.dal.page;
+
+import com.ym.mec.common.page.QueryInfo;
+import com.ym.mec.web.dal.enums.YesOrNoEnum;
+import io.swagger.annotations.ApiModelProperty;
+
+public class GoodsCategoryQueryInfo extends QueryInfo {
+
+    @ApiModelProperty(value = "上级分类")
+    private Integer parentId;
+
+    @ApiModelProperty(value = "状态（1，可见  0，不可见）")
+    private YesOrNoEnum status;
+
+    public Integer getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(Integer parentId) {
+        this.parentId = parentId;
+    }
+
+    public YesOrNoEnum getStatus() {
+        return status;
+    }
+
+    public void setStatus(YesOrNoEnum status) {
+        this.status = status;
+    }
+}