From 166ed31eb9a7e708f968f63b9f4ed23abfc16841 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期四, 19 十月 2023 17:54:55 +0800
Subject: [PATCH] 修改订单核销时间

---
 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/DiscussApi.java |   57 +++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 53 insertions(+), 4 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/DiscussApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/DiscussApi.java
index 0b5f266..d2b8e1f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/DiscussApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/DiscussApi.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.util.StrUtil;
 import com.panzhihua.applets.weixin.CheckService;
+import com.panzhihua.common.constants.Constants;
 import com.panzhihua.common.controller.BaseController;
 import com.panzhihua.common.model.dtos.community.*;
 import com.panzhihua.common.model.dtos.community.integral.admin.AddComActIntegralUserDTO;
@@ -54,7 +55,7 @@
         if (StrUtil.isNotBlank(discussSubject)) {
             String result = checkService.checkMessageBy(discussSubject, openid, appId);
             if (StrUtil.isNotBlank(result)) {
-                return R.fail("填写内容存在 " + result + " 违规信息");
+                return R.fail(501, "填写内容存在 " + result + " 违规信息");
             }
         }
 
@@ -62,7 +63,7 @@
         String photoPah = comActDiscussDTO.getPhotoPah();
         if (StrUtil.isNotBlank(photoPah)) {
             if (!checkService.checkImageBy(photoPah, appId)) {
-                return R.fail("上传图片存在违规信息");
+                return R.fail(501, "上传图片存在违规信息");
             }
         }
 
@@ -117,6 +118,26 @@
         return communityService.pageDiscussApplets(pageComActDiscussDTO);
     }
 
+    @ApiOperation(value = "一起议-分页查询-脱敏", response = ComActDiscussVO.class)
+    @PostMapping("pageDiscussDesensitize")
+    public R pageDiscussDesensitize(@RequestBody PageComActDiscussDTO pageComActDiscussDTO) {
+        if (Objects.isNull(pageComActDiscussDTO.getType())) {
+            return R.fail("查询类型不能为空");
+        }
+        LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+        if (loginUserInfo != null) {
+            pageComActDiscussDTO.setCommunityId(loginUserInfo.getCommunityId());
+            pageComActDiscussDTO.setLoginUserId(loginUserInfo.getUserId());
+
+            Integer isMy = pageComActDiscussDTO.getIsMy();
+            if (null != isMy && isMy.intValue() == 1) {
+                pageComActDiscussDTO.setUserId(loginUserInfo.getUserId());
+            }
+        }
+        return communityService.pageDiscussAppletsDesensitize(pageComActDiscussDTO);
+    }
+
+
     @ApiOperation(value = "一起议-回复")
     @PostMapping("discusscomment")
     public R addDiscussComment(@RequestBody ComActDiscussCommentDTO comActDiscussCommentDTO) {
@@ -130,7 +151,7 @@
         }
         String result = checkService.checkMessageBy(comment, this.getLoginUserInfo().getOpenid(), this.getAppId());
         if (StrUtil.isNotBlank(result)) {
-            return R.fail("填写内容存在 " + result + " 违规信息");
+            return R.fail(501, "填写内容存在 " + result + " 违规信息");
         }
         comActDiscussCommentDTO.setUserId(this.getUserId());
         // 议事投票计算积分
@@ -168,6 +189,18 @@
         return communityService.detailDiscussApplets(id, userId);
     }
 
+    @ApiOperation(value = "一起议-详情-脱敏", response = ComActDiscussVO.class)
+    @GetMapping("discussDesensitize")
+    @ApiImplicitParam(name = "id", value = "一起议主键", required = true)
+    public R detailDiscussDesensitize(@RequestParam("id") Long id) {
+        Long userId = 0L;
+        LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+        if (loginUserInfo != null) {
+            userId = loginUserInfo.getUserId();
+        }
+        return communityService.detailDiscussAppletsDesensitize(id, userId);
+    }
+
     @ApiOperation(value = "一起议-评论-分页查询", response = ComActDiscussCommentVO.class)
     @PostMapping("pagediscusscomment")
     public R pageDiscussComment(@RequestBody PageComActDiscussCommentDTO pageComActDiscussCommentDTO) {
@@ -184,6 +217,22 @@
         return communityService.pageDiscussCommentApplets(pageComActDiscussCommentDTO);
     }
 
+    @ApiOperation(value = "一起议-评论-分页查询-脱敏", response = ComActDiscussCommentVO.class)
+    @PostMapping("pageDiscussCommentDesensitize")
+    public R pageDiscussCommentDesensitize(@RequestBody PageComActDiscussCommentDTO pageComActDiscussCommentDTO) {
+        Long id = pageComActDiscussCommentDTO.getId();
+        if (null == id || 0 == id) {
+            return R.fail("一起议主键不能为空");
+        }
+        Long userId = 0L;
+        LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+        if (loginUserInfo != null) {
+            userId = loginUserInfo.getUserId();
+        }
+        pageComActDiscussCommentDTO.setLoginUserId(userId);
+        return communityService.pageDiscussCommentAppletsDesensitize(pageComActDiscussCommentDTO);
+    }
+
     @ApiOperation(value = "一起议-评论-回复")
     @PostMapping("discusscommentback")
     public R addDiscussCommentBack(@RequestBody ComActDiscussCommentDTO comActDiscussCommentDTO) {
@@ -197,7 +246,7 @@
         }
         String result = checkService.checkMessageBy(comment, this.getLoginUserInfo().getOpenid(), this.getAppId());
         if (StrUtil.isNotBlank(result)) {
-            return R.fail("填写内容存在 " + result + " 违规信息");
+            return R.fail(501, "填写内容存在 " + result + " 违规信息");
         }
         comActDiscussCommentDTO.setUserId(this.getUserId());
         return communityService.addDiscussCommentBack(comActDiscussCommentDTO);

--
Gitblit v1.7.1