From d81a9b79631105d1603bfe5bdff88b71741c77c9 Mon Sep 17 00:00:00 2001 From: lidongdong <1459917685@qq.com> Date: 星期六, 14 十月 2023 20:05:55 +0800 Subject: [PATCH] 便民服务 商家评价 金汇地图 --- springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/JinHuiCommnuityApi.java | 171 +++++++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 147 insertions(+), 24 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/JinHuiCommnuityApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/JinHuiCommnuityApi.java index 666d3d1..39c85d7 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/JinHuiCommnuityApi.java +++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/JinHuiCommnuityApi.java @@ -4,11 +4,16 @@ import com.alibaba.fastjson.JSONObject; import com.panzhihua.common.controller.BaseController; import com.panzhihua.common.model.dtos.community.PageActWorkGuideDTO; +import com.panzhihua.common.model.dtos.community.convenient.PageConvenientMerchantDTO; import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComActActRegistVO; import com.panzhihua.common.model.vos.community.ComActActivityVO; +import com.panzhihua.common.model.vos.community.ComActWorkGuideVO; import com.panzhihua.common.model.vos.community.SignactivityVO; +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.user.SysUserNoticeVO; @@ -29,8 +34,7 @@ @RestController @RequestMapping("/jin_hui/") @Api(tags = {"小程序-金汇社区api"}) -public class JinHuiCommnuityApi extends BaseController -{ +public class JinHuiCommnuityApi extends BaseController { @Resource private CommunityService communityService; @@ -96,35 +100,30 @@ @ApiOperation(value = "获取个人金汇币总币", response = JinhuiCoinGeneralTableVO.class) - @GetMapping("goldCoin/getDetails" ) - public R coinTableGetDetails() - { - return jinhuiCommunityService.coinTableGetDetails( this.getUserId()+""); + @GetMapping("goldCoin/getDetails") + public R coinTableGetDetails() { + return jinhuiCommunityService.coinTableGetDetails(this.getUserId() + ""); } @ApiOperation(value = "获取个人金汇币明细", response = JinhuiGoldCoinRecordVO.class) @GetMapping("/record/getList") - public R recordGetList(@RequestParam("pageNum") int pageNum, - @RequestParam("pageSize") int pageSize) - { - return jinhuiCommunityService.recordGetList(pageNum,pageSize,this.getUserId()+""); + public R recordGetList(@RequestParam("pageNum") int pageNum, + @RequestParam("pageSize") int pageSize) { + return jinhuiCommunityService.recordGetList(pageNum, pageSize, this.getUserId() + ""); } @ApiOperation(value = "获取个人金汇币明细详情", response = JinhuiGoldCoinRecordVO.class) @GetMapping("/jinhuiRecord/getDetails") - public R recordGetDetails(@RequestParam("id") String id) - { + public R recordGetDetails(@RequestParam("id") String id) { return jinhuiCommunityService.recordGetDetails(id); } @ApiOperation(value = "删除金汇币记录") @PostMapping("/record/expurgateData") - public R recordExpurgateData(@RequestParam("id") String id) - { + public R recordExpurgateData(@RequestParam("id") String id) { return jinhuiCommunityService.recordExpurgateData(id); } - /** @@ -133,27 +132,151 @@ * @param workGuideId * @return 详情 */ - @ApiOperation(value = "办事指南_详情") + @ApiOperation(value = "办事指南_详情", response = ComActWorkGuideVO.class) @GetMapping("/detailworkguide") public R detailWorkGuide(@RequestParam("workGuideId") String workGuideId, - @RequestParam("communityId") String communityId) - { - return jinhuiCommunityService.detailWorkGuide(workGuideId,communityId); + @RequestParam("communityId") String communityId) { + return jinhuiCommunityService.detailWorkGuide(workGuideId, communityId); } /** * 办事指南_分页 * - * @param pageActWorkGuideDTO - * 查询参数 + * @param pageActWorkGuideDTO 查询参数 * @return 分页集合 */ - @ApiOperation(value = "办事指南_分页") + @ApiOperation(value = "办事指南_分页", response = ComActWorkGuideVO.class) @PostMapping("/pageworkguide") - public R pageWorkGuide(@RequestBody PageActWorkGuideDTO pageActWorkGuideDTO) - { + public R pageWorkGuide(@RequestBody PageActWorkGuideDTO pageActWorkGuideDTO) { return jinhuiCommunityService.pageWorkGuide(pageActWorkGuideDTO); } + /** + * 删除便民服务商家 + * + * @param merchantId + * @return + */ + @ApiOperation(value = "删除便民服务商家") + @DeleteMapping("/merchant/delete") + public R deleteMerchant(@RequestParam("merchantId") String merchantId, + @RequestParam("operator") String operator) { + return jinhuiCommunityService.deleteMerchant(merchantId, operator); + } + + /** + * 分页查询便民服务商家 运营后台 + * + * @param pageConvenientMerchantDTO + * @return + */ + @ApiOperation(value = "分页查询便民服务商家", response = ConvenientMerchantVO.class) + @PostMapping("/merchant/page") + public R pageMerchant(@RequestBody PageConvenientMerchantDTO pageConvenientMerchantDTO) + { + return jinhuiCommunityService.pageMerchant(pageConvenientMerchantDTO); + } + + /** + * 获取便民服务商家详情 + * + * @param merchantId + * @return + */ + @ApiOperation(value = "获取便民服务商家详情", response = ConvenientMerchantVO.class) + @GetMapping("/merchant/get") + 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); + } + + + /*************************************************************************************************** + * + * + * 商家评论 + * + * + **************************************************************************************************/ + /** + * 商家评论列表 + * @param pageNum + * @param pageSize + * @param merchantId + * @return + */ + @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); + } + + /** + * 商家评论列单个详情 + * @param id + * @return + */ + @ApiOperation(value = "商家评论列单个详情", response = JinghuiMerchantEvaluateVO.class) + @GetMapping("/merchantEvaluate/getDetails") + public R merchantEvaluateGetDetails(@RequestParam("id") String id) + { + return jinhuiCommunityService.merchantEvaluateGetDetails(id); + } + + /** + * 商家评论列添加 + * @param + * @return + */ + @ApiOperation(value = "商家评论列添加") + @PostMapping("/merchantEvaluate/addData") + public R merchantEvaluateAddData(@RequestBody JinghuiMerchantEvaluateVO item) + { + return jinhuiCommunityService.merchantEvaluateAddData(item); + } + + /** + * 商家评论列编辑 + * @param item + * @return + */ + @ApiOperation(value = "商家评论列编辑") + @PostMapping("/merchantEvaluate/editData") + 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) + { + return jinhuiCommunityService.merchantEvaluateExpurgateData(id); + } + + } -- Gitblit v1.7.1