Merge branch 'test' into 'master'

罗yu 元桥

2021-04-29 78a900b916f9007e45d45355d6e1de21eb71147e

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -6,6 +6,10 @@
import com.panzhihua.common.model.dtos.advertisement.PageComOpsAdvDTO;
import com.panzhihua.common.model.dtos.community.*;
import com.panzhihua.common.model.dtos.neighbor.*;
import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAdminDTO;
import com.panzhihua.common.model.dtos.neighbor.AddComActNeighborCircleAppDTO;
import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAppDTO;
import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleDetailAppDTO;
import com.panzhihua.common.model.dtos.shop.PageComShopOrderSearchDTO;
import com.panzhihua.common.model.dtos.shop.*;
import com.panzhihua.common.model.dtos.shop.PageComShopGoodsDTO;
@@ -2264,6 +2268,32 @@
    R neighborDetailByApp(@RequestBody ComActNeighborCircleDetailAppDTO neighborCircleAppDTO);

    /**
     * 管理后台查询邻里圈列表
     * @param comActNeighborCircleAdminDTO  请求参数
     * @return  邻里圈列表
     */
    @PostMapping("/neighbor/pageNeighborByAdmin")
    R pageNeighborByAdmin(@RequestBody ComActNeighborCircleAdminDTO comActNeighborCircleAdminDTO);


    /**
     * 后台修改邻里圈
     * @param comActNeighborCircleAdminDTO  请求参数
     */
    @PostMapping("/neighbor/changeStatusByAdmin")
    R changeStatusByAdmin(@RequestBody ComActNeighborCircleAdminDTO comActNeighborCircleAdminDTO);


    /**
     * 后台修改邻里圈
     * @param id  邻里圈id
     * @return  邻里圈列表
     */
    @PostMapping("/neighbor/deleteByAdmin")
    R deleteByAdmin(@RequestParam("id")Long id);


    /**
     * 用户查询邻里圈列表
     * @param neighborCircleAppDTO  请求参数
     * @return  邻里圈列表