From c5fea961b83fefbface6c75d5383a21e773dda2b Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期六, 08 五月 2021 16:47:03 +0800
Subject: [PATCH] 修复邻里圈管理后台评论状态修改时更新邻里圈的评论数

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java |   44 +++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 41 insertions(+), 3 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 bd36842..fecac9c 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,14 +1,21 @@
 package com.panzhihua.service_community.api;
 
+import com.panzhihua.common.exceptions.PartyBuildingMemberException;
 import com.panzhihua.common.model.dtos.community.*;
 import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComCvtServeExcelVO;
+import com.panzhihua.common.model.vos.partybuilding.PartyBuildingMemberExcelVO;
 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.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.validation.Valid;
+import java.util.List;
 
 /**
  * @description: 便民服务接口
@@ -41,6 +48,17 @@
     }
 
     /**
+     * 小程序通过便民服务区域分页查询便民服务商家
+     *
+     * @param comCvtBusinessAppletsDTO 查询参数
+     * @return 返回结果
+     */
+    @PostMapping("/business/area/page")
+    public R pageComCvtBusinessByServiceArea(@RequestBody PageComCvtBusinessAppletsDTO comCvtBusinessAppletsDTO) {
+        return comCvtBusinessService.pageComCvtBusinessByServiceArea(comCvtBusinessAppletsDTO);
+    }
+
+    /**
      * 新增便民服务商家
      *
      * @param comCvtBusinessDTO 商家参数
@@ -66,11 +84,12 @@
      * 查询便民服务商家详情
      *
      * @param id 商家主键
+     * @param cityCode 城市编码
      * @return 返回结果
      */
     @GetMapping("/business/get")
-    public R getComCvtBusiness(@RequestParam("id") Long id) {
-        return comCvtBusinessService.getComCvtBusiness(id);
+    public R getComCvtBusiness(@RequestParam("id") Long id, @RequestParam("cityCode") String cityCode) {
+        return comCvtBusinessService.getComCvtBusiness(id, cityCode);
     }
 
     /**
@@ -112,7 +131,7 @@
      * @return 返回结果
      */
     @PostMapping("/category/add")
-    public R addComCvtCategory(@RequestBody ComCvtCategoryDTO comCvtCategoryDTO) {
+    public R addComCvtCategory(@Valid @RequestBody ComCvtCategoryDTO comCvtCategoryDTO) {
         return comCvtCategoryService.addComCvtCategory(comCvtCategoryDTO);
     }
 
@@ -203,4 +222,23 @@
     public R deleteComCvtServe(@RequestParam("id") Long id) {
         return comCvtServeService.deleteComCvtServe(id);
     }
+
+    /**
+     * 小程序便民服务商家详情
+     * @param id 商家ID
+     * @return
+     */
+    @GetMapping("/business/serve/get")
+    public R getComCvtBusinessServeDetail(@RequestParam("id")Long id){
+        return comCvtBusinessService.getComCvtBusinessServeDetail(id);
+    };
+
+    /**
+     * 批量新增商家服务
+     * @param list 服务集合
+     */
+    @PostMapping("/serve/import")
+    public R listSaveConvenientServeExcelVO(@RequestBody List<ComCvtServeExcelVO> list,@RequestParam("communityId") Long communityId){
+        return comCvtServeService.listSaveConvenientServeExcelVO(list,communityId);
+    }
 }

--
Gitblit v1.7.1