修改三说会堂

lidongdong

2023-10-16 a12e09a5bc73672dcd4665d35a1ef8c9d1c534b0

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/jinhui/JinhuiCommunityService.java

@@ -2,18 +2,13 @@

import com.panzhihua.common.model.dtos.community.ComActWorkGuideDTO;
import com.panzhihua.common.model.dtos.community.PageActWorkGuideDTO;
import com.panzhihua.common.model.dtos.community.convenient.PageConvenientMerchantDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActActRegistVO;
import com.panzhihua.common.model.vos.community.ComActWorkGuideClassifyVO;
import com.panzhihua.common.model.vos.community.SignactivityVO;
import com.panzhihua.common.model.vos.jinhui.JinhuiCoinGeneralTableVO;
import com.panzhihua.common.model.vos.jinhui.JinhuiGoldCoinRecordVO;
import com.panzhihua.common.model.vos.jinhui.*;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.*;

/**
 * 金汇社区
@@ -86,6 +81,11 @@
    public R recordExpurgateData(@RequestParam("id") String id);


    /*************************************************************************************************
     *
     *                                  办事指南
     *
     ***************************************************************************************************/

    /**
     * 办事指南_新增
@@ -96,7 +96,7 @@
     */
    @PostMapping("/JinhuiWorkGuide/addworkguide")
    @Transactional(rollbackFor = Exception.class)
    public R addWorkGuide(@RequestBody ComActWorkGuideDTO workGuideDTO, @RequestParam("userId") Long userId);
    public R addWorkGuide(@RequestBody ComActWorkGuideDTO workGuideDTO, @RequestParam("userId") String userId);

    /**
     * 办事指南_编辑
@@ -106,7 +106,7 @@
     */
    @PostMapping("/JinhuiWorkGuide/editworkguide")
    @Transactional(rollbackFor = Exception.class)
    public R putWorkGuide(@RequestBody ComActWorkGuideDTO workGuideDTO, @RequestParam("userId") Long userId) ;
    public R putWorkGuide(@RequestBody ComActWorkGuideDTO workGuideDTO, @RequestParam("userId") String userId) ;

    /**
     * 办事指南_详情
@@ -136,7 +136,7 @@
     * @return 删除结果
     */
    @PostMapping("/JinhuiWorkGuide/delectworkguide")
    R delectWorkGuide(@RequestParam("workGuideId") Long workGuideId) ;
    R delectWorkGuide(@RequestParam("workGuideId") String workGuideId) ;

    /**
     * 分页查询办事执念-分类管理 addWorkGuideClassify  分页查询办事执念-分类管理
@@ -166,7 +166,7 @@
     * @date 2021/8/31 15:03
     */
    @GetMapping("/JinhuiWorkGuide/workGuide/classify/delete")
    public R deleteWorkGuideClassify(@RequestParam("workGuideClassifyId") Long workGuideClassifyId) ;
    public R deleteWorkGuideClassify(@RequestParam("workGuideClassifyId") String workGuideClassifyId) ;

    /**
     * 办事指南-分类管理列表查询  getWorkGuideClassifyList  办事指南-分类管理列表查询
@@ -191,7 +191,206 @@
     * @return  办事指南列表数据
     */
    @GetMapping("/JinhuiWorkGuide/listworkguide/classify")
    public R listWorkGuideByClassifyId(@RequestParam("classifyId") Long classifyId) ;
    public R listWorkGuideByClassifyId(@RequestParam("classifyId") String classifyId) ;


    /**********************************************************************************************
     *
     *
     *                            便民服务
     *
     *
     ************************************************************************************************/

    /**
     * 删除便民服务商家
     *
     * @param merchantId
     * @return
     */
    @DeleteMapping("/jinhuiMerchant/delete")
    public R deleteMerchant(@RequestParam("merchantId") String merchantId, @RequestParam("operator") String operator);

    /**
     * 分页查询便民服务商家 运营后台
     *
     * @param pageConvenientMerchantDTO
     * @return
     */
    @PostMapping("/jinhuiMerchant/page")
    public R pageMerchant(@RequestBody PageConvenientMerchantDTO pageConvenientMerchantDTO);

    /**
     * 获取便民服务商家详情
     *
     * @param merchantId
     * @return
     */
    @GetMapping("/jinhuiMerchant/get")
    public R getMerchant(@RequestParam("merchantId") String merchantId);


    /**
     * 分页查询 商家类别
     * @param
     * @return
     */
    @GetMapping("/jinhuiMerchant/getCategories")
    public R getListCategories(@RequestParam("pageNum") int pageNum,
                               @RequestParam("pageSize") int pageSize);


    /**************************************************************************************************************
     *
     *
     *                                      商家评论
     *
     *
     *************************************************************************************************************/
    /**
     * 商家评论列表
     * @param pageNum
     * @param pageSize
     * @param merchantId
     * @return
     */
    @GetMapping("/jinghuiMerchantEvaluate/getList")
    public R merchantEvaluateGetList(@RequestParam("pageNum")  int pageNum,
                                     @RequestParam("pageSize")  int pageSize,
                                     @RequestParam("merchantId")   String merchantId);

    /**
     * 商家评论列单个详情
     * @param id
     * @return
     */
    @GetMapping("/jinghuiMerchantEvaluate/getDetails")
    public R merchantEvaluateGetDetails(@RequestParam("id") String id);
    /**
     * 商家评论列添加
     * @param
     * @return
     */
    @PostMapping("/jinghuiMerchantEvaluate/addData")
    public R merchantEvaluateAddData(@RequestBody JinghuiMerchantEvaluateVO item);

    /**
     * 商家评论列编辑
     * @param item
     * @return
     */
    @PostMapping("/jinghuiMerchantEvaluate/editData")
    public R merchantEvaluateEditData(@RequestBody JinghuiMerchantEvaluateVO item);

    /**
     * 商家评论列删除
     * @param id
     * @return
     */
    @PostMapping("/jinghuiMerchantEvaluate/expurgateData")
    public R merchantEvaluateExpurgateData(@RequestParam("id") String id);


    /*********************************************************************************************************
     *
     *
     *                                金汇预约空间
     *
     *
     *********************************************************************************************************/
    /**
     * 金汇空间预约模块分页查询
     * @param
     * @return
     */
    @GetMapping("/JinhuiInterspace/interspaceGetList")
    public R interspaceGetList(@RequestParam("pageNum") int pageNum,
                               @RequestParam("pageSize") int pageSize,
                               @RequestParam(value = "intendantType",required = false) String intendantType);

    /**
     * 金汇空间预约模块单个详情
     * @param id
     * @return
     */
    @GetMapping("/JinhuiInterspace/interspaceGetList")
    public R interspaceGetDetails(@RequestParam("id") String id);

    /**
     * 金汇空间预约模块新增
     * @param
     * @return
     */
    @PostMapping("/JinhuiInterspace/interspaceAddData")
    public R interspaceAddData(@RequestBody JinhuiInterspaceVO item);


    /**
     * 金汇空间预约模块编辑
     * @param id
     * @return
     */
    @PostMapping("/JinhuiInterspace/interspaceEditData")
    public R interspaceEditData(@RequestBody JinhuiInterspaceVO item);


    /**
     * 金汇空间预约模块删除
     * @param id
     * @return
     */
    @GetMapping("/JinhuiInterspace/interspaceExpurgateData")
    public R interspaceExpurgateData(@RequestParam("id") String id);


    /****************************************************************************************************
     *
     *
     *                                     空间预约分类
     *
     *
     ******************************************************************************************************/
    /**
     * 空间预约分类分页查询
     * @param
     * @return
     */
    @GetMapping("/JinhuiInterspace/interspaceTypeGetList")
    public R interspaceTypeGetList(@RequestParam("pageNum") int pageNum,
                                   @RequestParam("pageSize") int pageSize);

    /**
     * 空间预约分类单个详情
     * @param
     * @return
     */
    @GetMapping("/JinhuiInterspace/interspaceTypeGetDetails")
    public R interspaceTypeGetDetails(@RequestParam("id") String id);

    /**
     * 空间预约分类新增
     * @param
     * @return
     */
    @PostMapping("/JinhuiInterspace/interspaceTypeAddData")
    public R interspaceTypeAddData(@RequestBody JinhuiInterspaceTypeVO item);

    /**
     * 空间预约分类编辑
     * @param
     * @return
     */
    @PostMapping("/JinhuiInterspace/interspaceTypeEditData")
    public R interspaceTypeEditData(@RequestBody JinhuiInterspaceTypeVO item);


    /**
     * 空间预约分类删除
     * @param
     * @return
     */
    @DeleteMapping("/JinhuiInterspace/interspaceTypeExpurgateData")
    public R interspaceTypeExpurgateData(@RequestParam("id") String id);