Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuish...

101captain

2022-07-22 da8edafa9803834b08061fd30ac79f8c249900b8

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java

@@ -19,6 +19,8 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;

import static java.util.Objects.isNull;

/**
 * @auther lyq
 * @create 2021-04-14 15:02:49
@@ -205,8 +207,9 @@
    @ApiOperation(value = "查询社区邻里圈话题列表", response = ComActNeighborCircleTopicAppVO.class)
    @GetMapping("topic/list")
    public R getNeighborTopicByApp(
            @RequestParam(value = "name",defaultValue = "",required = false) String name) {
        return communityService.getNeighborTopicByApp(name);
            @RequestParam(value = "name",defaultValue = "",required = false) String name,
            @RequestParam(value = "belongType", defaultValue = "1", required = false) Integer belongType) {
        return communityService.getNeighborTopicByApp(name, belongType);
    }

    @ApiOperation(value = "用户删除邻里圈")
@@ -231,6 +234,7 @@
    @ApiOperation(value = "新版接单问题",response =ComActNeighborCircleAppVO.class )
    @PostMapping("selectSolve")
    public R selectSolve(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO) {
        neighborCircleAppDTO.setUserId(this.getUserId());
        return communityService.selectSolve(neighborCircleAppDTO);
    }

@@ -245,5 +249,13 @@
    public R order(@RequestBody EditNeighborCircleAdminVO editNeighborCircleAdminVO){
        return this.communityService.order(editNeighborCircleAdminVO);
    }

    @ApiOperation(value = "服务统计",response = ServiceStaticsVO.class)
    @PostMapping("/serviceStatic")
    public R serviceStatic(@RequestBody ServiceStaticDTO serviceStaticDTO){
        return this.communityService.serviceStatic(serviceStaticDTO);
    }


}