From fe3d8816882117d963c93b678573bb93f0047911 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 08 十一月 2022 16:55:00 +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 |   93 ++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 77 insertions(+), 16 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 25e4970..35907ba 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
@@ -5,6 +5,7 @@
 import com.panzhihua.common.model.dtos.PageBaseDTO;
 import com.panzhihua.common.model.dtos.community.*;
 import com.panzhihua.common.model.dtos.community.acid.*;
+import com.panzhihua.common.model.dtos.community.convenient.*;
 import com.panzhihua.common.model.dtos.community.dpc.AddDpcDTO;
 import com.panzhihua.common.model.dtos.community.dpc.EditDpcDTO;
 import com.panzhihua.common.model.dtos.community.dpc.PageDpcDTO;
@@ -85,22 +86,6 @@
 import com.panzhihua.common.model.dtos.community.cluster.admin.EditClusterMemberAdminDto;
 import com.panzhihua.common.model.dtos.community.cluster.admin.PageClusterAdminDto;
 import com.panzhihua.common.model.dtos.community.cluster.admin.PageClusterMemberAdminDto;
-import com.panzhihua.common.model.dtos.community.convenient.ConvenientMerchantDTO;
-import com.panzhihua.common.model.dtos.community.convenient.ConvenientProductCategoryDTO;
-import com.panzhihua.common.model.dtos.community.convenient.ConvenientProductDTO;
-import com.panzhihua.common.model.dtos.community.convenient.ConvenientServiceCategoryDTO;
-import com.panzhihua.common.model.dtos.community.convenient.DeleteConvenientProductDTO;
-import com.panzhihua.common.model.dtos.community.convenient.DisableOrEnableConvenientMerchantDTO;
-import com.panzhihua.common.model.dtos.community.convenient.ExportMerchantDTO;
-import com.panzhihua.common.model.dtos.community.convenient.OnShelfOrOffShelfProductDTO;
-import com.panzhihua.common.model.dtos.community.convenient.PageClassifyMerchantDTO;
-import com.panzhihua.common.model.dtos.community.convenient.PageConvenientMerchantDTO;
-import com.panzhihua.common.model.dtos.community.convenient.PageConvenientProductCategoryDTO;
-import com.panzhihua.common.model.dtos.community.convenient.PageConvenientProductDTO;
-import com.panzhihua.common.model.dtos.community.convenient.PageConvenientServiceCategoryDTO;
-import com.panzhihua.common.model.dtos.community.convenient.PagePopularMerchantDTO;
-import com.panzhihua.common.model.dtos.community.convenient.PageSearchDTO;
-import com.panzhihua.common.model.dtos.community.convenient.ResetPasswordConvenientMerchantDTO;
 import com.panzhihua.common.model.dtos.community.easyPhoto.AddEasyPhotoActivityDTO;
 import com.panzhihua.common.model.dtos.community.easyPhoto.AddEasyPhotoClassifyDTO;
 import com.panzhihua.common.model.dtos.community.easyPhoto.EditEasyPhotoActivityDTO;
@@ -10495,4 +10480,80 @@
     @PostMapping("/proceedings")
     R addOrUpdateProceedings(@RequestBody ComActProceedingsDTO comActProceedingsDTO);
 
+    /**
+     * 自提点分页查询
+     * @param pageConvenientElevatingPointDTO
+     * @return
+     */
+    @PostMapping("/convenient/point/page")
+    R pagePoint(PageConvenientElevatingPointDTO pageConvenientElevatingPointDTO);
+
+    /**
+     * 新增自提点
+     * @param convenientElevatingPointDTO
+     * @return
+     */
+    @PostMapping("/convenient/point/add")
+    R addPoint(ConvenientElevatingPointDTO convenientElevatingPointDTO);
+
+    /**
+     * 编辑自提点
+     * @param convenientElevatingPointDTO
+     * @return
+     */
+    @PutMapping("/convenient/point/put")
+    R putPoint(ConvenientElevatingPointDTO convenientElevatingPointDTO);
+
+    /**
+     * 删除便民服务 自提点
+     * @param pointId
+     * @param operator
+     * @return
+     */
+    @DeleteMapping("/point/delete")
+    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();
 }

--
Gitblit v1.7.1