From 86df207c37502cce1b2043e1c7c0486459eef1d6 Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期四, 13 三月 2025 19:58:45 +0800 Subject: [PATCH] 党员、诉求评论基础代码 --- springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/XmostBeautifulApi.java | 49 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 47 insertions(+), 2 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/XmostBeautifulApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/XmostBeautifulApi.java index 78fcd70..b6881a9 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/XmostBeautifulApi.java +++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/XmostBeautifulApi.java @@ -107,13 +107,15 @@ communityId=getCommunityId()+""; } + String userId=null; + if(StringUtils.isEmpty(merchantId)) { - return R.fail("商家id不能为空"); + userId=getUserId()+""; } return communityService.getList(pageNum,pageSize,goodsId,orderNumber,goodsName, - condition,userName,communityId,getUserId()+"",orderType,merchantId); + condition,userName,communityId,userId,orderType,merchantId); } /** @@ -506,7 +508,50 @@ communityId=getCommunityId()+""; } + if(StringUtils.isEmpty(merchantId)) + { + return R.fail("商家id不能为空"); + } + return communityService.WithdrawGetList(pageNum,pageSize,disposeType, merchantName,merchantId,communityId); } + + /*************************************************************************************************************** + * + * 路北社区系统配置 商家折扣 兑换地点信息 + * + ****************************************************************************************************************/ + + /** + * 详情 + * @param + * @return + */ + @GetMapping("/Community/Config/getData") + public R ConfiggetData(@RequestParam("communityId") String communityId) + { + return communityService.ConfiggetData(communityId); + } + + + /******************************************************************************************************************* + * + * + * 社区折扣 + * + * + ******************************************************************************************************************/ + + /** + * 分页查询 + * @param + * @return + */ + @GetMapping("/community/discount/getList") + public R CommunityDiscountgetList(@RequestParam("communityId") String communityId) + { + return communityService.CommunityDiscountgetList(communityId); + } + } -- Gitblit v1.7.1