From 48a703dec596b5d2c1b04b0b4f7ed0f28c1ca898 Mon Sep 17 00:00:00 2001 From: lidongdong <1459917685@qq.com> Date: 星期一, 13 十一月 2023 18:00:50 +0800 Subject: [PATCH] 新增社区共建评论模块2 --- springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 127 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 126 insertions(+), 1 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java index d65fe99..2afed60 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java +++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java @@ -39,6 +39,7 @@ import com.panzhihua.common.model.vos.community.reserve.ComActReserveDangerAreaVO; import com.panzhihua.common.model.vos.shop.AddShopFlowerGoodsVO; import com.panzhihua.common.utlis.StringUtils; +import com.panzhihua.service_community.entity.VolunteerCommunityConfigVO; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import org.springframework.cloud.openfeign.FeignClient; @@ -11541,7 +11542,8 @@ @RequestParam(value = "userName", required = false) String userName, @RequestParam(value = "communityId", required = false) String communityId, @RequestParam(value = "userId", required = false) String userId, - @RequestParam(value = "orderType", required = false) String orderType); + @RequestParam(value = "orderType", required = false) String orderType, + @RequestParam(value = "merchantId", required = false) String merchantId); /** * 查询详情 @@ -11707,17 +11709,140 @@ + /*************************************************************************************************************** + * + * 路北社区商家提现 + * + ****************************************************************************************************************/ + + /** + * 商家提现列表啊 + * @param disposeType + * @return + */ + @GetMapping("/VolunteerMerchant/withdraw/getList") + public R WithdrawGetList(@RequestParam("pageNum") int pageNum, + @RequestParam("pageSize") int pageSize, + @RequestParam(value = "disposeType", required = false) String disposeType, + @RequestParam(value = "merchantName", required = false) String merchantName, + @RequestParam(value = "merchantId", required = false) String merchantId, + @RequestParam(value = "communityId", required = false) String communityId); + + /** + * 新增商家提现 + * @param item + * @return + */ + @PostMapping("/VolunteerMerchant/withdraw/insert") + public R WithdrawInsert(@RequestBody VolunteerMerchantWithdrawVO item); + + /** + * 编辑商家提现 + * @param item + * @return + */ + @PostMapping("/VolunteerMerchant/withdraw/update") + public R WithdrawUpdate(@RequestBody VolunteerMerchantWithdrawVO item); + + /** + * 删除商家提现 + * @param id + * @return + */ + @GetMapping("/VolunteerMerchant/withdraw/delete") + public R WithdrawDelete(@RequestParam("id") String id); + + /** + * 处理商家提现 + * @param id + * @return + */ + @GetMapping("/VolunteerMerchant/withdraw/dispose") + public R WithdrawDispose(@RequestParam("id") String id); + /*************************************************************************************************************** + * + * 路北社区系统配置 商家折扣 兑换地点信息 + * + ****************************************************************************************************************/ + + /** + * 详情 + * @param + * @return + */ + @GetMapping("/VolunteerMerchant/Community/Config/getData") + public R ConfiggetData(@RequestParam("communityId") String communityId); + + /** + * 新增 + * @param + * @return + */ + @PostMapping("/VolunteerMerchant/Community/Config/insertvo") + public R Configinsertvo(@RequestBody VolunteerCommunityConfigVO item); + + + + /******************************************************************************************************************* + * + * + * 社区折扣 + * + * + ******************************************************************************************************************/ + + + /** + * 分页查询 + * @param + * @return + */ + @GetMapping("/VolunteerMerchant/community/discount/getList") + public R CommunityDiscountgetList(@RequestParam("communityId") String communityId); + + /** + * 新增 + * @param + * @return + */ + @PostMapping("/VolunteerMerchant/community/discount/insert") + public R CommunityDiscountinsert(@RequestBody VolunteerCommunityDiscountVO item); + + + @PostMapping("/VolunteerMerchant/community/discount/update") + public R CommunityDiscountupdate(@RequestBody VolunteerCommunityDiscountVO item); + + + @DeleteMapping("/VolunteerMerchant/community/discount/delete") + public R CommunityDiscountdelete(@RequestParam("id") String id); + /** + * 报名/取消报名社区活动 + * 金汇社区专用 + * @param signactivityVO + * 报名参数 + * @return 报名 取消报名 结果 + */ + @PostMapping("/jinhui/jinhuiSignActivity") + public R jinhuiSignActivity(@RequestBody SignactivityVO signactivityVO); + /** + * 用户签到 + * 金汇社区专用 + * @param comActActRegistVO 签到参数 + * @return 签到结果 + */ + @PostMapping("/jinhui/jinhuiActivitySignIn") + public R jinhuiActivitySignIn(@RequestBody ComActActRegistVO comActActRegistVO); -- Gitblit v1.7.1