From 947d016e4bd349b78d540e3a869f55d68b2c610c Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期二, 08 十一月 2022 18:16:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java |   49 ++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 48 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
index 2133bc3..b02143a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -10511,5 +10511,52 @@
      * @return
      */
     @DeleteMapping("/point/delete")
-    R deletePoint(@RequestParam("pointId") Long pointId, @RequestParam("operator") Long operator)
+    R deletePoint(@RequestParam("pointId") Long pointId, @RequestParam("operator") Long operator);
+
+
+    /**
+     * 新增商品分类
+     * @param convenientGoodsCategoryDTO
+     * @return
+     */
+    @PostMapping("/goodsCategory/add")
+    R addGoodsCategory(@RequestBody ConvenientGoodsCategoryDTO convenientGoodsCategoryDTO);
+
+    /**
+     * 编辑
+     * @param convenientGoodsCategoryDTO
+     * @return
+     */
+    @PutMapping("/goodsCategory/put")
+    R putGoodsCategory(@RequestBody ConvenientGoodsCategoryDTO convenientGoodsCategoryDTO);
+
+    /**
+     * 删除商品分类
+     * @param categoryId
+     * @return
+     */
+    @DeleteMapping("/goodsCategory/delete")
+    R deleteGoodsCategory(@RequestParam("categoryId") Long categoryId, @RequestParam("operator") Long operator);
+
+    /**
+     * 获取商品分类详情
+     * @param categoryId
+     * @return
+     */
+    @GetMapping("/goodsCategory/get")
+    R getGoodsCategory(@RequestParam("categoryId") Long categoryId);
+
+    /**
+     * 分页查询商品分类
+     * @param pageConvenientGoodsCategoryDTO
+     * @return
+     */
+    @PostMapping("/goodsCategory/page")
+     R pageGoodsCategory(@RequestBody PageConvenientGoodsCategoryDTO pageConvenientGoodsCategoryDTO);
+
+    @GetMapping("/dataCount")
+    R dataCount();
+
+    @DeleteMapping("/proceedings/remove")
+    R removeProceedings(@RequestParam("id") Long id);
 }

--
Gitblit v1.7.1