Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-07-22 02f18587bd8860b305e2c688e20465be166bb48c

 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: 便民服务接口
@@ -38,6 +45,17 @@
    @PostMapping("/business/page")
    public R pageComCvtBusiness(@RequestBody PageComCvtBusinessDTO pageComCvtBusinessDTO) {
        return comCvtBusinessService.pageComCvtBusiness(pageComCvtBusinessDTO);
    }

    /**
     * 小程序通过便民服务区域分页查询便民服务商家
     *
     * @param comCvtBusinessAppletsDTO 查询参数
     * @return 返回结果
     */
    @PostMapping("/business/area/page")
    public R pageComCvtBusinessByServiceArea(@RequestBody PageComCvtBusinessAppletsDTO comCvtBusinessAppletsDTO) {
        return comCvtBusinessService.pageComCvtBusinessByServiceArea(comCvtBusinessAppletsDTO);
    }

    /**
@@ -112,7 +130,7 @@
     * @return 返回结果
     */
    @PostMapping("/category/add")
    public R addComCvtCategory(@RequestBody ComCvtCategoryDTO comCvtCategoryDTO) {
    public R addComCvtCategory(@Valid @RequestBody ComCvtCategoryDTO comCvtCategoryDTO) {
        return comCvtCategoryService.addComCvtCategory(comCvtCategoryDTO);
    }

@@ -203,4 +221,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(value = "communityId",required = false) Long communityId){
        return comCvtServeService.listSaveConvenientServeExcelVO(list,communityId);
    }
}