From 15c1d716e6a89b38e6af36b62fc372b93779df01 Mon Sep 17 00:00:00 2001
From: puhanshu <hansgoallout@163.com>
Date: 星期三, 22 九月 2021 23:02:50 +0800
Subject: [PATCH] 便民服务小程序

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java |  451 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 425 insertions(+), 26 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 99498dd..78af34d 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
@@ -1,15 +1,53 @@
 package com.panzhihua.service_community.api;
 
-import com.panzhihua.common.model.dtos.community.*;
+import java.util.List;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+
+import com.panzhihua.common.model.dtos.community.convenient.PageClassifyMerchantDTO;
+import com.panzhihua.common.model.dtos.community.convenient.PageMerchantProductDTO;
+import com.panzhihua.common.model.dtos.community.convenient.PagePopularMerchantDTO;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.panzhihua.common.model.dtos.community.ComCvtBusinessDTO;
+import com.panzhihua.common.model.dtos.community.ComCvtCategoryDTO;
+import com.panzhihua.common.model.dtos.community.ComCvtServeDTO;
+import com.panzhihua.common.model.dtos.community.PageComCvtBusinessAppletsDTO;
+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 io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.*;
+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 javax.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * @description: 便民服务接口
@@ -30,10 +68,23 @@
     @Resource
     private ComCvtServeService comCvtServeService;
 
+    @Resource
+    private ConvenientServiceCategoryService convenientServiceCategoryService;
+
+    @Resource
+    private ConvenientMerchantService convenientMerchantService;
+
+    @Resource
+    private ConvenientProductCategoryService convenientProductCategoryService;
+
+    @Resource
+    private ConvenientProductService convenientProductService;
+
     /**
      * 社区后台分页查询便民服务商家
      *
-     * @param pageComCvtBusinessDTO 查询参数
+     * @param pageComCvtBusinessDTO
+     *            查询参数
      * @return 返回结果
      */
     @PostMapping("/business/page")
@@ -44,7 +95,8 @@
     /**
      * 小程序通过便民服务区域分页查询便民服务商家
      *
-     * @param comCvtBusinessAppletsDTO 查询参数
+     * @param comCvtBusinessAppletsDTO
+     *            查询参数
      * @return 返回结果
      */
     @PostMapping("/business/area/page")
@@ -55,7 +107,8 @@
     /**
      * 新增便民服务商家
      *
-     * @param comCvtBusinessDTO 商家参数
+     * @param comCvtBusinessDTO
+     *            商家参数
      * @return 返回结果
      */
     @PostMapping("/business/add")
@@ -66,7 +119,8 @@
     /**
      * 编辑便民服务商家
      *
-     * @param comCvtBusinessDTO 商家参数
+     * @param comCvtBusinessDTO
+     *            商家参数
      * @return 返回结果
      */
     @PutMapping("/business/put")
@@ -77,7 +131,8 @@
     /**
      * 查询便民服务商家详情
      *
-     * @param id 商家主键
+     * @param id
+     *            商家主键
      * @return 返回结果
      */
     @GetMapping("/business/get")
@@ -88,7 +143,8 @@
     /**
      * 删除便民服务商家信息
      *
-     * @param id 商家主键
+     * @param id
+     *            商家主键
      * @return 返回结果
      */
     @DeleteMapping("/business/delete")
@@ -96,11 +152,11 @@
         return comCvtBusinessService.deleteComCvtBusiness(id);
     }
 
-
     /**
      * 社区后台分页查询便民服务分类
      *
-     * @param pageComCvtCategoryDTO 查询参数
+     * @param pageComCvtCategoryDTO
+     *            查询参数
      * @return 返回结果
      */
     @PostMapping("/category/page")
@@ -110,6 +166,7 @@
 
     /**
      * 便民服务分类下拉,所有分类
+     * 
      * @return 返回结果
      */
     @PostMapping("/category/all")
@@ -120,18 +177,20 @@
     /**
      * 新增便民服务分类
      *
-     * @param comCvtCategoryDTO 分类参数
+     * @param comCvtCategoryDTO
+     *            分类参数
      * @return 返回结果
      */
     @PostMapping("/category/add")
-    public R addComCvtCategory(@RequestBody ComCvtCategoryDTO comCvtCategoryDTO) {
+    public R addComCvtCategory(@Valid @RequestBody ComCvtCategoryDTO comCvtCategoryDTO) {
         return comCvtCategoryService.addComCvtCategory(comCvtCategoryDTO);
     }
 
     /**
      * 编辑便民服务分类
      *
-     * @param comCvtCategoryDTO 分类参数
+     * @param comCvtCategoryDTO
+     *            分类参数
      * @return 返回结果
      */
     @PutMapping("/category/put")
@@ -142,7 +201,8 @@
     /**
      * 查询便民服务分类详情
      *
-     * @param id 分类主键
+     * @param id
+     *            分类主键
      * @return 返回结果
      */
     @GetMapping("/category/get")
@@ -153,7 +213,8 @@
     /**
      * 删除便民服务分类信息
      *
-     * @param id 分类主键
+     * @param id
+     *            分类主键
      * @return 返回结果
      */
     @DeleteMapping("/category/delete")
@@ -164,7 +225,8 @@
     /**
      * 社区后台分页查询便民服务
      *
-     * @param pageComCvtServeDTO 查询参数
+     * @param pageComCvtServeDTO
+     *            查询参数
      * @return 返回结果
      */
     @PostMapping("/serve/page")
@@ -175,7 +237,8 @@
     /**
      * 新增便民服务
      *
-     * @param comCvtServeDTO 参数
+     * @param comCvtServeDTO
+     *            参数
      * @return 返回结果
      */
     @PostMapping("/serve/add")
@@ -186,7 +249,8 @@
     /**
      * 编辑便民服务
      *
-     * @param comCvtServeDTO 分类参数
+     * @param comCvtServeDTO
+     *            分类参数
      * @return 返回结果
      */
     @PutMapping("/serve/put")
@@ -197,7 +261,8 @@
     /**
      * 查询便民服务详情
      *
-     * @param id 服务主键
+     * @param id
+     *            服务主键
      * @return 返回结果
      */
     @GetMapping("/serve/get")
@@ -208,7 +273,8 @@
     /**
      * 删除便民服务信息
      *
-     * @param id 服务主键
+     * @param id
+     *            服务主键
      * @return 返回结果
      */
     @DeleteMapping("/serve/delete")
@@ -218,11 +284,344 @@
 
     /**
      * 小程序便民服务商家详情
-     * @param id 商家ID
+     * 
+     * @param id
+     *            商家ID
      * @return
      */
     @GetMapping("/business/serve/get")
-    public R getComCvtBusinessServeDetail(@RequestParam("id")Long id){
+    public R getComCvtBusinessServeDetail(@RequestParam("id") Long id) {
         return comCvtBusinessService.getComCvtBusinessServeDetail(id);
-    };
+    }
+
+    /**
+     * 批量新增商家服务
+     * 
+     * @param list
+     *            服务集合
+     */
+    @PostMapping("/serve/import")
+    public R listSaveConvenientServeExcelVO(@RequestBody List<ComCvtServeExcelVO> list,
+        @RequestParam(value = "communityId", required = false) Long communityId) {
+        return comCvtServeService.listSaveConvenientServeExcelVO(list, communityId);
+    }
+
+    /**
+     * 便民服务新增分类
+     * @param convenientServiceCategoryDTO
+     * @return
+     */
+    @PostMapping("/service-category/add")
+    public R addServiceCategory(@RequestBody ConvenientServiceCategoryDTO convenientServiceCategoryDTO) {
+        return convenientServiceCategoryService.addServiceCategory(convenientServiceCategoryDTO);
+    }
+
+    /**
+     * 便民服务分类编辑
+     * @param convenientServiceCategoryDTO
+     * @return
+     */
+    @PutMapping("/service-category/put")
+    public R putServiceCategory(@RequestBody ConvenientServiceCategoryDTO convenientServiceCategoryDTO) {
+        return convenientServiceCategoryService.putServiceCategory(convenientServiceCategoryDTO);
+    }
+
+    /**
+     * 便民服务分类删除
+     * @param categoryId
+     * @return
+     */
+    @DeleteMapping("/service-category/delete")
+    public R deleteServiceCategory(@RequestParam("categoryId") Long categoryId, @RequestParam("operator") Long operator) {
+        return convenientServiceCategoryService.deleteServiceCategoryById(categoryId, operator);
+    }
+
+    /**
+     * 获取便民服务分类详情
+     * @param categoryId
+     * @return
+     */
+    @GetMapping("/service-category/get")
+    public R getServiceCategory(@RequestParam("categoryId") Long categoryId) {
+        return convenientServiceCategoryService.getServiceCategoryById(categoryId);
+    }
+
+    /**
+     * 分页查询便民服务分类
+     * @param pageConvenientServiceCategoryDTO
+     * @return
+     */
+    @PostMapping("/service-category/page")
+    public R pageServiceCategory(@RequestBody PageConvenientServiceCategoryDTO pageConvenientServiceCategoryDTO) {
+        return convenientServiceCategoryService.pageServiceCategory(pageConvenientServiceCategoryDTO);
+    }
+
+    /**
+     * 便民服务新增商家
+     * @param convenientMerchantDTO
+     * @return
+     */
+    @PostMapping("/merchant/add")
+    public R addMerchant(@RequestBody ConvenientMerchantDTO convenientMerchantDTO) {
+        return convenientMerchantService.addMerchant(convenientMerchantDTO);
+    }
+
+    /**
+     * 编辑便民服务商家
+     * @param convenientMerchantDTO
+     * @return
+     */
+    @PutMapping("/merchant/put")
+    public R putMerchant(@RequestBody ConvenientMerchantDTO convenientMerchantDTO) {
+        return convenientMerchantService.putMerchant(convenientMerchantDTO);
+    }
+
+    /**
+     * 删除便民服务商家
+     * @param merchantId
+     * @return
+     */
+    @DeleteMapping("/merchant/delete")
+    public R deleteMerchant(@RequestParam("merchantId") Long merchantId, @RequestParam("operator") Long operator) {
+        return convenientMerchantService.deleteMerchant(merchantId, operator);
+    }
+
+    /**
+     * 分页查询便民服务商家
+     * @param pageConvenientMerchantDTO
+     * @return
+     */
+    @PostMapping("/merchant/page")
+    public R pageMerchant(@RequestBody PageConvenientMerchantDTO pageConvenientMerchantDTO) {
+        return convenientMerchantService.pageMerchant(pageConvenientMerchantDTO);
+    }
+
+    /**
+     * 获取便民服务商家详情
+     * @param merchantId
+     * @return
+     */
+    @GetMapping("/merchant/get")
+    public R getMerchant(@RequestParam("merchantId") Long merchantId) {
+        return convenientMerchantService.getMerchant(merchantId);
+    }
+
+    /**
+     * 禁用/启用便民服务商家
+     * @param disableOrEnableConvenientMerchantDTO
+     * @return
+     */
+    @PutMapping("/merchant/disable-or-enable")
+    public R disableOrEnableMerchant(@RequestBody DisableOrEnableConvenientMerchantDTO disableOrEnableConvenientMerchantDTO) {
+        return convenientMerchantService.disableOrEnableMerchant(disableOrEnableConvenientMerchantDTO);
+    }
+
+    /**
+     * 重置便民服务商家账号密码
+     * @param resetPasswordConvenientMerchantDTO
+     * @return
+     */
+    @PutMapping("/merchant/reset-password")
+    public R resetPasswordMerchant(@RequestBody ResetPasswordConvenientMerchantDTO resetPasswordConvenientMerchantDTO) {
+        return convenientMerchantService.resetPasswordMerchant(resetPasswordConvenientMerchantDTO);
+    }
+
+    /**
+     * 获取所有便民服务分类
+     * @return
+     */
+    @GetMapping("/service-category/all")
+    public R getAllServiceCategories() {
+        return convenientServiceCategoryService.getAllServiceCategories();
+    }
+
+    /**
+     * 获取用户便民服务商家详情
+     * @param account 商家绑定账号
+     * @return
+     */
+    @GetMapping("/getUserMerchantInfoByAccount")
+    public R<ConvenientMerchantVO> getUserMerchantInfoByAccount(@RequestParam("account") String account) {
+        return convenientMerchantService.getUserMerchantInfoByAccount(account);
+    }
+
+    /**
+     * 获取商便民服务商家信息
+     * @param userId
+     * @return
+     */
+    @GetMapping("/merchantInfo")
+    public R<ConvenientMerchantVO> getUserConvenientMerchantInfo(@RequestParam("userId") Long userId) {
+        return convenientMerchantService.getUserConvenientMerchantInfo(userId);
+    }
+
+    /**
+     * 新增便民服务产品分类信息
+     * @param convenientProductCategoryDTO
+     * @return
+     */
+    @PostMapping("/product-category/add")
+    public R addProductCategory(@RequestBody ConvenientProductCategoryDTO convenientProductCategoryDTO) {
+        return convenientProductCategoryService.addProductCategory(convenientProductCategoryDTO);
+    }
+
+    /**
+     * 编辑便民服务产品分类信息
+     * @param convenientProductCategoryDTO
+     * @return
+     */
+    @PutMapping("/product-category/put")
+    public R putProductCategory(@RequestBody ConvenientProductCategoryDTO convenientProductCategoryDTO) {
+        return convenientProductCategoryService.putProductCategory(convenientProductCategoryDTO);
+    }
+
+    /**
+     * 删除便民服务产品分类信息
+     * @param categoryId
+     * @param operator
+     * @return
+     */
+    @DeleteMapping("/product-category/delete")
+    public R deleteProductCategory(@RequestParam("categoryId") Long categoryId, @RequestParam("operator") Long operator) {
+        return convenientProductCategoryService.deleteProductCategory(categoryId, operator);
+    }
+
+    /**
+     * 获取便民服务产品分类详情
+     * @param categoryId
+     * @return
+     */
+    @GetMapping("/product-category/get")
+    public R getProductCategory(@RequestParam("categoryId") Long categoryId) {
+        return convenientProductCategoryService.getProductCategory(categoryId);
+    }
+
+    /**
+     * 分页查询便民服务产品分类信息
+     * @param pageConvenientProductCategoryDTO
+     * @return
+     */
+    @PostMapping("/product-category/page")
+    public R pageProductCategory(@RequestBody PageConvenientProductCategoryDTO pageConvenientProductCategoryDTO) {
+        return convenientProductCategoryService.pageProductCategory(pageConvenientProductCategoryDTO);
+    }
+
+    /**
+     * 便民服务商家后台新增产品
+     * @param convenientProductDTO
+     * @return
+     */
+    @PostMapping("/product/add")
+    public R addProduct(@RequestBody ConvenientProductDTO convenientProductDTO) {
+        return convenientProductService.addProduct(convenientProductDTO);
+    }
+
+    /**
+     * 便民服务商家后台编辑产品
+     * @param convenientProductDTO
+     * @return
+     */
+    @PutMapping("/product/put")
+    public R putProduct(@RequestBody ConvenientProductDTO convenientProductDTO) {
+        return convenientProductService.putProduct(convenientProductDTO);
+    }
+
+    /**
+     * 便民服务商家后台获取产品详情
+     * @param productId
+     * @return
+     */
+    @GetMapping("/product/get")
+    public R getProduct(@RequestParam("productId") Long productId) {
+        return convenientProductService.getProduct(productId);
+    }
+
+    /**
+     * 便民服务商家后台分页获取产品信息
+     * @param pageConvenientProductDTO
+     * @return
+     */
+    @PostMapping("/product/page")
+    public R pageProduct(@RequestBody PageConvenientProductDTO pageConvenientProductDTO) {
+        return convenientProductService.pageProduct(pageConvenientProductDTO);
+    }
+
+    /**
+     * 便民服务商家后台删除产品信息
+     * @param deleteConvenientProductDTO
+     * @return
+     */
+    @DeleteMapping("/product/delete")
+    public R deleteProduct(@RequestBody DeleteConvenientProductDTO deleteConvenientProductDTO) {
+        return convenientProductService.deleteProduct(deleteConvenientProductDTO);
+    }
+
+    /**
+     * 便民服务商家后台上架/下架产品
+     * @param onShelfOrOffShelfProductDTO
+     * @return
+     */
+    @PutMapping("/product/onShelf-or-offShelf")
+    public R onShelfOrOffShelfProduct(@RequestBody OnShelfOrOffShelfProductDTO onShelfOrOffShelfProductDTO) {
+        return convenientProductService.onShelfOrOffShelfProduct(onShelfOrOffShelfProductDTO);
+    }
+
+    /**
+     * 获取所有产品分类
+     * @return
+     */
+    @GetMapping("/product-category/all")
+    public R getAllProductCategory() {
+        return convenientProductCategoryService.getAllProductCategory();
+    }
+
+    /**
+     * 获取该社区商家数量大于0的分类
+     * @param communityId
+     * @return
+     */
+    @GetMapping("/service-category/suitable")
+    public R getSuitableServiceCategories(@RequestParam("communityId") Long communityId) {
+        return convenientServiceCategoryService.getSuitableServiceCategories(communityId);
+    }
+
+    /**
+     * 获取该社区下的热门商家
+     * @param pagePopularMerchantDTO
+     * @return
+     */
+    @PostMapping("/merchant/popular")
+    public R getPopularMerchants(@RequestBody PagePopularMerchantDTO pagePopularMerchantDTO) {
+        return convenientMerchantService.getPopularMerchants(pagePopularMerchantDTO);
+    }
+
+    /**
+     * 分页获取服务类型下商家信息
+     * @param pageClassifyMerchantDTO
+     * @return
+     */
+    @PostMapping("/merchant/classify")
+    public R getClassifyMerchants(@RequestBody PageClassifyMerchantDTO pageClassifyMerchantDTO) {
+        return convenientMerchantService.getClassifyMerchants(pageClassifyMerchantDTO);
+    }
+
+    /**
+     * 小程序获取商家详情
+     * @param merchantId
+     * @return
+     */
+    @GetMapping("/merchant/detail")
+    public R getMerchantDetail(@RequestParam("merchantId") Long merchantId) {
+        return convenientMerchantService.getMerchantDetail(merchantId);
+    }
+
+    /**
+     * 小程序获取商家产品
+     * @param pageMerchantProductDTO
+     * @return
+     */
+    @PostMapping("/merchant/product")
+    public R getMerchantProduct(@RequestBody PageMerchantProductDTO pageMerchantProductDTO) {
+        return convenientProductService.getMerchantProduct(pageMerchantProductDTO);
+    }
 }

--
Gitblit v1.7.1