lidongdong
2023-10-17 b027229c58636817d42da258a2fb9ebcfecaf13c
金汇空间预约申请小程序  后天接口
3个文件已修改
251 ■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/JinHuiCommnuityApi.java 132 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/jinhui/JinhuiCommunityService.java 55 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/JinhuiAppi.java 64 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/JinHuiCommnuityApi.java
@@ -10,10 +10,7 @@
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
import com.panzhihua.common.model.vos.community.convenient.ConvenientServiceCategoryVO;
import com.panzhihua.common.model.vos.jinhui.JinghuiMerchantEvaluateVO;
import com.panzhihua.common.model.vos.jinhui.JinhuiCoinGeneralTableVO;
import com.panzhihua.common.model.vos.jinhui.JinhuiGoldCoinRecordVO;
import com.panzhihua.common.model.vos.jinhui.JinhuiInterspaceVO;
import com.panzhihua.common.model.vos.jinhui.*;
import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.jinhui.JinhuiCommunityService;
@@ -133,7 +130,7 @@
    @ApiOperation(value = "办事指南_详情", response = ComActWorkGuideVO.class)
    @GetMapping("/detailworkguide")
    public R detailWorkGuide(@RequestParam("workGuideId") String workGuideId) {
        return jinhuiCommunityService.detailWorkGuide(workGuideId, getCommunityId()+"");
        return jinhuiCommunityService.detailWorkGuide(workGuideId, getCommunityId() + "");
    }
    /**
@@ -170,8 +167,7 @@
     */
    @ApiOperation(value = "分页查询便民服务商家", response = ConvenientMerchantVO.class)
    @PostMapping("/merchant/page")
    public R pageMerchant(@RequestBody PageConvenientMerchantDTO pageConvenientMerchantDTO)
    {
    public R pageMerchant(@RequestBody PageConvenientMerchantDTO pageConvenientMerchantDTO) {
        return jinhuiCommunityService.pageMerchant(pageConvenientMerchantDTO);
    }
@@ -183,24 +179,22 @@
     */
    @ApiOperation(value = "获取便民服务商家详情", response = ConvenientMerchantVO.class)
    @GetMapping("/merchant/get")
    public R getMerchant(@RequestParam("merchantId") String merchantId)
    {
    public R getMerchant(@RequestParam("merchantId") String merchantId) {
        return jinhuiCommunityService.getMerchant(merchantId);
    }
    /**
     * 分页查询 商家类别
     *
     * @param
     * @return
     */
    @ApiOperation(value = "获取便民服务商家类别列表", response = ConvenientServiceCategoryVO.class)
    @GetMapping("/getCategories")
    public R getListCategories(@RequestParam("pageNum") int pageNum,
                               @RequestParam("pageSize") int pageSize)
    {
        return jinhuiCommunityService.getListCategories(pageNum,pageSize);
                               @RequestParam("pageSize") int pageSize) {
        return jinhuiCommunityService.getListCategories(pageNum, pageSize);
    }
@@ -213,6 +207,7 @@
     **************************************************************************************************/
    /**
     * 商家评论列表
     *
     * @param pageNum
     * @param pageSize
     * @param merchantId
@@ -220,58 +215,57 @@
     */
    @ApiOperation(value = "商家评论列表", response = JinghuiMerchantEvaluateVO.class)
    @GetMapping("/merchantEvaluate/getList")
    public R merchantEvaluateGetList(@RequestParam("pageNum")  int pageNum,
                                     @RequestParam("pageSize")  int pageSize,
                                     @RequestParam("merchantId")   String merchantId)
    {
        return jinhuiCommunityService.merchantEvaluateGetList(pageNum,pageSize,merchantId);
    public R merchantEvaluateGetList(@RequestParam("pageNum") int pageNum,
                                     @RequestParam("pageSize") int pageSize,
                                     @RequestParam("merchantId") String merchantId) {
        return jinhuiCommunityService.merchantEvaluateGetList(pageNum, pageSize, merchantId);
    }
    /**
     * 商家评论列单个详情
     *
     * @param id
     * @return
     */
    @ApiOperation(value = "商家评论列单个详情", response = JinghuiMerchantEvaluateVO.class)
    @GetMapping("/merchantEvaluate/getDetails")
    public R merchantEvaluateGetDetails(@RequestParam("id") String id)
    {
    public R merchantEvaluateGetDetails(@RequestParam("id") String id) {
        return jinhuiCommunityService.merchantEvaluateGetDetails(id);
    }
    /**
     * 商家评论列添加
     *
     * @param
     * @return
     */
    @ApiOperation(value = "商家评论列添加")
    @PostMapping("/merchantEvaluate/addData")
    public R merchantEvaluateAddData(@RequestBody JinghuiMerchantEvaluateVO item)
    {
    public R merchantEvaluateAddData(@RequestBody JinghuiMerchantEvaluateVO item) {
        return jinhuiCommunityService.merchantEvaluateAddData(item);
    }
    /**
     * 商家评论列编辑
     *
     * @param item
     * @return
     */
    @ApiOperation(value = "商家评论列编辑")
    @PostMapping("/merchantEvaluate/editData")
    public R merchantEvaluateEditData(@RequestBody JinghuiMerchantEvaluateVO item)
    {
    public R merchantEvaluateEditData(@RequestBody JinghuiMerchantEvaluateVO item) {
        return jinhuiCommunityService.merchantEvaluateEditData(item);
    }
    /**
     * 商家评论列删除
     *
     * @param id
     * @return
     */
    @ApiOperation(value = "商家评论列删除")
    @PostMapping("/merchantEvaluate/expurgateData")
    public R merchantEvaluateExpurgateData(@RequestParam("id") String id)
    {
    public R merchantEvaluateExpurgateData(@RequestParam("id") String id) {
        return jinhuiCommunityService.merchantEvaluateExpurgateData(id);
    }
@@ -299,6 +293,7 @@
     **********************************************************************************************/
    /**
     * 金汇空间预约模块分页查询
     *
     * @param
     * @return
     */
@@ -306,23 +301,98 @@
    @GetMapping("/interspaceGetList")
    public R interspaceGetList(@RequestParam("pageNum") int pageNum,
                               @RequestParam("pageSize") int pageSize,
                               @RequestParam(value = "intendantType",required = false) String intendantType)
    {
        return jinhuiCommunityService.interspaceGetList(pageNum,pageSize,intendantType);
                               @RequestParam(value = "intendantType", required = false) String intendantType) {
        return jinhuiCommunityService.interspaceGetList(pageNum, pageSize, intendantType);
    }
    /**
     * 金汇空间预约模块单个详情
     *
     * @param id
     * @return
     */
    @ApiOperation(value = "金汇空间详情", response = JinhuiInterspaceVO.class)
    @GetMapping("/interspaceGetDetails")
    public R interspaceGetDetails(@RequestParam("id") String id)
    {
    public R interspaceGetDetails(@RequestParam("id") String id) {
        return jinhuiCommunityService.interspaceGetDetails(id);
    }
    /***************************************************************************************************************
     *
     *
     *                                       空间预约申请
     *
     *
     **************************************************************************************************************/
    /**
     * 空间预约申请分页查询
     *
     * @param
     * @return
     */
    @ApiOperation(value = "空间预约申请分页", response = JinhuiInterspaceApplyForVO.class)
    @GetMapping("//applyFor/getList")
    public R applyForGetList(@RequestParam("pageNum") int pageNum,
                             @RequestParam("pageSize") int pageSize,
                             @RequestParam(value = "intendantType", required = false) String intendantType,
                             @RequestParam(value = "state", required = false) String state) {
        return jinhuiCommunityService.applyForGetList(pageNum, pageSize, intendantType, state);
    }
    /**
     * 空间预约申请详情
     *
     * @param
     * @return
     */
    @ApiOperation(value = "空间预约申请详情", response = JinhuiInterspaceApplyForVO.class)
    @GetMapping("/applyFor/getDetails")
    public R applyForGetDetails(@RequestParam("id") String id)
    {
        return jinhuiCommunityService.applyForGetDetails(id);
    }
    /**
     * 空间预约申请新增
     * @param
     * @return
     */
    @ApiOperation(value = "空间预约申请新增")
    @PostMapping("/applyFor/addData")
    public R applyForAddData(@RequestBody JinhuiInterspaceApplyForVO item)
    {
        return jinhuiCommunityService.applyForAddData(item);
    }
    /**
     * 空间预约申请编辑
     * @param
     * @return
     */
    @ApiOperation(value = "空间预约申请编辑")
    @PostMapping("/applyFor/editData")
    public R applyForEditData(@RequestBody JinhuiInterspaceApplyForVO item)
    {
        return jinhuiCommunityService.applyForEditData(item);
    }
    /**
     * 空间预约申请删除
     * @param
     * @return
     */
    @ApiOperation(value = "空间预约申请删除")
    @DeleteMapping("/applyFor/expurgateData")
    public R applyForExpurgateData(@RequestParam("id") String id)
    {
        return jinhuiCommunityService.applyForExpurgateData(id);
    }
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/jinhui/JinhuiCommunityService.java
@@ -394,4 +394,59 @@
    /***************************************************************************************************************
     *
     *
     *                                       空间预约申请
     *
     *
     **************************************************************************************************************/
    /**
     * 空间预约申请分页查询
     * @param
     * @return
     */
    @GetMapping("/JinhuiInterspace/applyFor/getList")
    public R applyForGetList(@RequestParam("pageNum") int pageNum,
                             @RequestParam("pageSize") int pageSize,
                             @RequestParam(value = "intendantType",required = false) String intendantType,
                             @RequestParam(value = "state",required = false) String state);
    /**
     * 空间预约申请详情
     * @param
     * @return
     */
    @GetMapping("/JinhuiInterspace/applyFor/getDetails")
    public R applyForGetDetails(@RequestParam("id") String id);
    /**
     * 空间预约申请新增
     * @param
     * @return
     */
    @PostMapping("/JinhuiInterspace/applyFor/addData")
    public R applyForAddData(@RequestBody JinhuiInterspaceApplyForVO item);
    /**
     * 空间预约申请编辑
     * @param
     * @return
     */
    @PostMapping("/JinhuiInterspace/applyFor/editData")
    public R applyForEditData(@RequestBody JinhuiInterspaceApplyForVO item);
    /**
     * 空间预约申请删除
     * @param
     * @return
     */
    @DeleteMapping("/JinhuiInterspace/applyFor/expurgateData")
    public R applyForExpurgateData(@RequestParam("id") String id);
}
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/JinhuiAppi.java
@@ -6,12 +6,14 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActWorkGuideClassifyVO;
import com.panzhihua.common.model.vos.community.ComActWorkGuideVO;
import com.panzhihua.common.model.vos.jinhui.JinhuiInterspaceApplyForVO;
import com.panzhihua.common.model.vos.jinhui.JinhuiInterspaceTypeVO;
import com.panzhihua.common.model.vos.jinhui.JinhuiInterspaceVO;
import com.panzhihua.common.service.jinhui.JinhuiCommunityService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -316,6 +318,68 @@
/***************************************************************************************************************
 *
 *
 *                                       空间预约申请
 *
 *
 **************************************************************************************************************/
    /**
     * 空间预约申请分页查询
     *
     * @param
     * @return
     */
    @ApiOperation(value = "空间预约申请分页", response = JinhuiInterspaceApplyForVO.class)
    @GetMapping("//applyFor/getList")
    public R applyForGetList(@RequestParam("pageNum") int pageNum,
                             @RequestParam("pageSize") int pageSize,
                             @RequestParam(value = "intendantType", required = false) String intendantType,
                             @RequestParam(value = "state", required = false) String state) {
        return jinhuiCommunityService.applyForGetList(pageNum, pageSize, intendantType, state);
    }
    /**
     * 空间预约申请详情
     *
     * @param
     * @return
     */
    @ApiOperation(value = "空间预约申请详情", response = JinhuiInterspaceApplyForVO.class)
    @GetMapping("/applyFor/getDetails")
    public R applyForGetDetails(@RequestParam("id") String id)
    {
        return jinhuiCommunityService.applyForGetDetails(id);
    }
    /**
     * 空间预约申请编辑
     * @param
     * @return
     */
    @ApiOperation(value = "空间预约申请处理")
    @PostMapping("/applyFor/dispose")
    public R applyForEditData(@RequestBody JinhuiInterspaceApplyForVO item)
    {
        if(item==null)
        {
            return R.fail("必要参数不能为空");
        }
        if(StringUtils.isEmpty(item.getId()))
        {
            return R.fail("id不能为空");
        }
        if(StringUtils.isEmpty(item.getState()))
        {
            return R.fail("State不能为空");
        }
        return jinhuiCommunityService.applyForEditData(item);
    }