lidongdong
2023-10-27 cfef9d475dba8a006ea6eec554a6c4e0d41e4bb3
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/JinHuiCommnuityApi.java
@@ -156,9 +156,8 @@
     */
    @ApiOperation(value = "删除便民服务商家")
    @DeleteMapping("/merchant/delete")
    public R deleteMerchant(@RequestParam("merchantId") String merchantId,
                            @RequestParam("operator") String operator) {
        return jinhuiCommunityService.deleteMerchant(merchantId, operator);
    public R deleteMerchant(@RequestParam("merchantId") String merchantId) {
        return jinhuiCommunityService.deleteMerchant(merchantId);
    }
    /**
@@ -246,6 +245,7 @@
    @ApiOperation(value = "商家评论列添加")
    @PostMapping("/merchantEvaluate/addData")
    public R merchantEvaluateAddData(@RequestBody JinghuiMerchantEvaluateVO item) {
        item.setUserId(getUserId()+"");
        return jinhuiCommunityService.merchantEvaluateAddData(item);
    }
@@ -618,7 +618,268 @@
        JinhuiShoppingOrderVO vo=new JinhuiShoppingOrderVO();
        vo.setId(id);
        vo.setCancelType("1");
        vo.setCancelTime(new Date());
        return jinhuiCommunityService.orderEditData(vo);
    }
    /******************************************************************************************************
     *
     *                    金汇文章
     *
     *******************************************************************************************************/
    /**
     * 分页查询
     * @param
     * @return
     */
    @ApiOperation(value = "金汇文章列表", response = JinhuiArticleManagementVO.class)
    @GetMapping("/articleGetList")
    public R articleGetList(@RequestParam("pageNum") int pageNum,
                            @RequestParam("pageSize")  int pageSize)
    {
        return jinhuiCommunityService.articleGetList(pageNum,pageSize,"1","1");
    }
    /**
     * 详情
     * @param id
     * @return
     */
    @ApiOperation(value = "金汇文章详情", response = JinhuiArticleManagementVO.class)
    @GetMapping("/articleGetDetails")
    public R articleGetDetails(@RequestParam("id") String id)
    {
        return jinhuiCommunityService.articleGetDetails(id);
    }
    /*************************************************************************************************************
     *
     *                   金汇体验活动
     *
     ***************************************************************************************************************/
    /**
     * 分页查询
     *
     * @param
     * @return
     */
    @ApiOperation(value = "体验活动列表", response = JinhuiExperienceActivityVO.class)
    @GetMapping("/experienceGetList")
    public R experienceGetList(@RequestParam("pageNum") int pageNum,
                               @RequestParam("pageSize")  int pageSize,
                               @RequestParam(value = "activityName", required = false) String activityName,
                               @RequestParam(value = "activityType", required = false) String activityType,
                               @RequestParam(value = "starTime", required = false) Date starTime,
                               @RequestParam(value = "endTime", required = false) Date endTime)
    {
        return jinhuiCommunityService.experienceGetList(pageNum,pageSize,activityName,activityType,starTime,endTime);
    }
    /**
     * 单个详情
     * @param id
     * @return
     */
    @ApiOperation(value = "体验活动单个详情", response = JinhuiExperienceActivityVO.class)
    @GetMapping("/experienceGetDetails")
    public R experienceGetDetails(@RequestParam("id") String id)
    {
        return jinhuiCommunityService.experienceGetDetails(id,getUserId()+"");
    }
    /*******************************************************************************************************
     *
     *                           金汇报名体验
     *
     *******************************************************************************************************/
    /**
     * 分页查询
     *
     * @param
     * @return
     */
    @ApiOperation(value = "金汇报名体验列表", response = JinhuiApplyExperienceVO.class)
    @GetMapping("/applyExperienceGetList")
    public R applyExperienceGetList(@RequestParam("pageNum") int pageNum,
                                    @RequestParam("pageSize") int pageSize,
                                    @RequestParam(value = "isFeedback", required = false) String isFeedback,
                                    @RequestParam(value = "activityId", required = false) String activityId)
    {
        return jinhuiCommunityService.applyExperienceGetList(pageNum,pageSize,getUserId()+"",isFeedback,activityId);
    }
    /**
     * 详情
     * @param id
     * @return
     */
    @ApiOperation(value = "金汇报名体验详情", response = JinhuiApplyExperienceVO.class)
    @GetMapping("/applyExperienceGetDetails")
    public R applyExperienceGetDetails(@RequestParam("id") String id)
    {
        return jinhuiCommunityService.applyExperienceGetDetails(id,null,null);
    }
    /**
     * 新增
     *
     * @param
     * @return
     */
    @ApiOperation(value = "金汇报名体验新增")
    @PostMapping("/applyExperienceAddData")
    public R applyExperienceAddData(@RequestBody JinhuiApplyExperienceVO item)
    {
        item.setUserId(getUserId()+"");
        return jinhuiCommunityService.applyExperienceAddData(item);
    }
    /**
     * 填写反馈接口
     * @return
     */
    @ApiOperation(value = "金汇报名体验填写反馈接口")
    @GetMapping("/applyExperienceFilIn")
    public R filIn(@RequestParam("activityId") String activityId,
                   @RequestParam("content") String content)
    {
        return jinhuiCommunityService.filIn(getUserId()+"",activityId,content);
    }
    /******************************************************************************************************
     *
     *                    金汇家园
     *
     *******************************************************************************************************/
    /**
     * 分页查询
     * @param
     * @return
     */
    @ApiOperation(value = "金汇家园列表", response = JinhuiArticleManagementVO.class)
    @GetMapping("/homeGetList")
    public R homeGetList(@RequestParam("pageNum") int pageNum,
                         @RequestParam("pageSize")  int pageSize)
    {
        return jinhuiCommunityService.articleGetList(pageNum,pageSize,null,"2");
    }
    /**
     * 详情
     * @param id
     * @return
     */
    @ApiOperation(value = "金汇家园详情", response = JinhuiArticleManagementVO.class)
    @GetMapping("/homeGetDetails")
    public R homeGetDetails(@RequestParam("id") String id)
    {
        return jinhuiCommunityService.articleGetDetails(id);
    }
    /************************************************************************************************************
     *
     *
     *                         用户提交办理 /JinhuiWorkGuide/
     *
     *
     *******************************************************************************************************/
    /**
     * 分页查询
     * @param
     * @return
     */
    @ApiOperation(value = "我的提交办事指南列表",response = JinhuiQuestnaireUserAnswerVO.class)
    @GetMapping("/answer/getList")
    public R answerGetList(@RequestParam("pageNum") int pageNum,
                           @RequestParam("pageSize") int pageSize,
                           @RequestParam(value = "transactType", required = false) String transactType)
    {
        return jinhuiCommunityService.answerGetList(pageNum,pageSize,getUserId()+"",transactType);
    }
    /**
     * 获取详情
     * @param id
     * @return
     */
    @ApiOperation(value = "我的提交办事指南详情",response = JinhuiQuestnaireUserAnswerVO.class)
    @GetMapping("/answer/getDetails")
    public R answerGetDetails(@RequestParam("id") String id)
    {
        return jinhuiCommunityService.answerGetDetails(id);
    }
    /**
     * 新增
     * @param
     * @return
     */
    @ApiOperation(value = "我的提交办事指南申请办理")
    @PostMapping("/answer/addData")
    public R answerAddData(@RequestBody JinhuiQuestnaireUserAnswerVO item)
    {
        item.setUserId(getUserId()+"");
        item.setTransactType("0");
        return jinhuiCommunityService.answerAddData(item);
    }
    /**
     * 编辑
     * @param item
     * @return
     */
    @ApiOperation(value = "我的提交办事指南申请编辑")
    @PostMapping("/answer/editData")
    public R answerEditData(@RequestBody JinhuiQuestnaireUserAnswerVO item)
    {
        return jinhuiCommunityService.answerEditData(item);
    }
    /**
     * 删除
     * @param id
     * @return
     */
    @ApiOperation(value = "我的提交办事指南申请删除")
    @DeleteMapping("/answer/expurgateData")
    public R answerExpurgateData(@RequestParam("id") String id)
    {
        return jinhuiCommunityService.answerExpurgateData(id);
    }
    /****************************************************************************************************************
     *
     *
     *                                  金汇慈善公益
     *
     *
     ******************************************************************************************************************/
    /**
     * 分页查询
     *
     * @param
     * @return
     */
    @ApiOperation(value = "金汇慈善公益列表",response = JinhuiCharityVO.class)
    @GetMapping("/getCharityList")
    public R getCharityList(@RequestParam("pageNum") int pageNum,
                            @RequestParam("pageSize") int pageSize,
                            @RequestParam(value = "title", required = false) String title,
                            @RequestParam(value = "label", required = false) String label,
                            @RequestParam(value = "state", required = false) String state)
    {
        return jinhuiCommunityService.getCharityList(pageNum,pageSize,title,label,state);
    }
}