From bb4825f57b22b841c5eb6db4d72447e6036b3c9b Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期二, 08 十一月 2022 11:02:47 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java |   70 +++++++++++++++++++++++-----------
 1 files changed, 47 insertions(+), 23 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java
index 72a50a7..544269a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java
@@ -6,10 +6,8 @@
 import javax.annotation.Resource;
 import javax.validation.Valid;
 
-import com.panzhihua.common.model.dtos.community.convenient.ExportMerchantDTO;
-import com.panzhihua.common.model.dtos.community.convenient.PageClassifyMerchantDTO;
-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.*;
+import com.panzhihua.service_community.service.*;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -26,28 +24,9 @@
 import com.panzhihua.common.model.dtos.community.PageComCvtBusinessDTO;
 import com.panzhihua.common.model.dtos.community.PageComCvtCategoryDTO;
 import com.panzhihua.common.model.dtos.community.PageComCvtServeDTO;
-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.OnShelfOrOffShelfProductDTO;
-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.ResetPasswordConvenientMerchantDTO;
 import com.panzhihua.common.model.vos.R;
 import com.panzhihua.common.model.vos.community.ComCvtServeExcelVO;
 import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
-import com.panzhihua.service_community.service.ComCvtBusinessService;
-import com.panzhihua.service_community.service.ComCvtCategoryService;
-import com.panzhihua.service_community.service.ComCvtServeService;
-import com.panzhihua.service_community.service.ConvenientMerchantService;
-import com.panzhihua.service_community.service.ConvenientProductCategoryService;
-import com.panzhihua.service_community.service.ConvenientProductService;
-import com.panzhihua.service_community.service.ConvenientServiceCategoryService;
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -81,6 +60,9 @@
 
     @Resource
     private ConvenientProductService convenientProductService;
+
+    @Resource
+    private ConvenientElevatingPointService convenientElevatingPointService;
 
     /**
      * 社区后台分页查询便民服务商家
@@ -716,4 +698,46 @@
     public R getProductShelfNum(@RequestParam("merchantId") Long merchantId) {
         return convenientProductService.getProductShelfNum(merchantId);
     }
+
+
+    /**
+     * 分页查询自提点 运营后台
+     * @param pageConvenientElevatingPointDTO
+     * @return
+     */
+    @PostMapping("/point/page")
+    public R pagePoint(@RequestBody PageConvenientElevatingPointDTO pageConvenientElevatingPointDTO) {
+        return convenientElevatingPointService.pagePoint(pageConvenientElevatingPointDTO);
+    }
+
+    /**
+     * 便民服务新增 自提点
+     * @param convenientElevatingPointDTO
+     * @return
+     */
+    @PostMapping("/point/add")
+    public R addPoint(@RequestBody ConvenientElevatingPointDTO convenientElevatingPointDTO) {
+        return convenientElevatingPointService.addPoint(convenientElevatingPointDTO);
+    }
+
+    /**
+     * 编辑便民服务 自提点
+     * @param convenientElevatingPointDTO
+     * @return
+     */
+    @PutMapping("/point/put")
+    public R putPoint(@RequestBody ConvenientElevatingPointDTO convenientElevatingPointDTO) {
+        return convenientElevatingPointService.putPoint(convenientElevatingPointDTO);
+    }
+
+    /**
+     * 删除便民服务 自提点
+     * @param pointId
+     * @param operator
+     * @return
+     */
+    @DeleteMapping("/point/delete")
+    public R deletePoint(@RequestParam("pointId") Long pointId, @RequestParam("operator") Long operator) {
+        return convenientElevatingPointService.deletePoint(pointId,operator);
+}
 }

--
Gitblit v1.7.1