From 85f322e36c935d376c82aeaa7dc3a11ef121e4d3 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 16 十月 2023 13:39:35 +0800
Subject: [PATCH] 办事指南列表接口修改
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/JinHuiCommnuityApi.java | 220 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 213 insertions(+), 7 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 86617d3..5174401 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
@@ -3,9 +3,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.ComActActivityVO;
-import com.panzhihua.common.model.vos.community.SignactivityVO;
+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.user.SysUserNoticeVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.jinhui.JinhuiCommunityService;
@@ -22,10 +29,9 @@
@Slf4j
@RestController
-@RequestMapping("/JinHui/")
-@Api(tags = {"金汇社区api"})
-public class JinHuiCommnuityApi extends BaseController
-{
+@RequestMapping("/jin_hui/")
+@Api(tags = {"小程序-金汇社区api"})
+public class JinHuiCommnuityApi extends BaseController {
@Resource
private CommunityService communityService;
@@ -49,13 +55,21 @@
}
+ @ApiOperation(value = "用户签到")
+ @PostMapping("activitySignIn")
+ public R jinhuiactivitySignIn(@RequestBody @Validated(AddGroup.class) ComActActRegistVO comActActRegistVO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ comActActRegistVO.setUserId(loginUserInfo.getUserId());
+ return communityService.jinhuiActivitySignIn(comActActRegistVO);
+ }
+
@ApiOperation(value = "报名/取消报名社区活动")
@PutMapping("signactivity")
public R signActivity(@RequestBody @Validated(AddGroup.class) SignactivityVO signactivityVO) {
Long userId = this.getUserId();
Long activityId = signactivityVO.getActivityId();
signactivityVO.setUserId(userId);
- R r = jinhuiCommunityService.signActivity(signactivityVO);
+ R r = communityService.jinhuiSignActivity(signactivityVO);
if (R.isOk(r) && signactivityVO.getType().intValue() == 1) {
R r2 = communityService.detailActivity(activityId, userId, null, null);
ComActActivityVO comActActivityVO =
@@ -82,5 +96,197 @@
}
+ @ApiOperation(value = "获取个人金汇币总币", response = JinhuiCoinGeneralTableVO.class)
+ @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() + "");
+ }
+
+ @ApiOperation(value = "获取个人金汇币明细详情", response = JinhuiGoldCoinRecordVO.class)
+ @GetMapping("/jinhuiRecord/getDetails")
+ public R recordGetDetails(@RequestParam("id") String id) {
+ return jinhuiCommunityService.recordGetDetails(id);
+ }
+
+ @ApiOperation(value = "删除金汇币记录")
+ @PostMapping("/record/expurgateData")
+ public R recordExpurgateData(@RequestParam("id") String id) {
+ return jinhuiCommunityService.recordExpurgateData(id);
+ }
+
+
+ /**
+ * 办事指南_详情
+ *
+ * @param workGuideId
+ * @return 详情
+ */
+ @ApiOperation(value = "办事指南_详情", response = ComActWorkGuideVO.class)
+ @GetMapping("/detailworkguide")
+ public R detailWorkGuide(@RequestParam("workGuideId") String workGuideId,
+ @RequestParam("communityId") String communityId) {
+ return jinhuiCommunityService.detailWorkGuide(workGuideId, communityId);
+ }
+
+ /**
+ * 办事指南_分页
+ *
+ * @param pageActWorkGuideDTO 查询参数
+ * @return 分页集合
+ */
+ @ApiOperation(value = "办事指南_分页", response = ComActWorkGuideVO.class)
+ @PostMapping("/pageworkguide")
+ 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);
+ }
+
+
+ @ApiOperation(value = "办事指南列表-按分类查询", response = ComActWorkGuideAppletsVO.class)
+ @PostMapping("wx/list")
+ public R listWorkGuide(@RequestBody PageActWorkGuideDTO pageActWorkGuideDTO) {
+ return jinhuiCommunityService.listWorkGuide(pageActWorkGuideDTO);
+ }
+
+
+ @ApiOperation(value = "办事指南_分页", response = ComActWorkGuideVO.class)
+ @PostMapping("wx/pageworkguide")
+ public R detailWorkGuide(@RequestBody PageActWorkGuideDTO pageActWorkGuideDTO) {
+ return jinhuiCommunityService.pageWorkGuide(pageActWorkGuideDTO);
+ }
}
--
Gitblit v1.7.1