From 4cb51a8d6a46993cb30e22dcbaf85424a0ba9d43 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期四, 19 八月 2021 18:14:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into txb

---
 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/DiscussApi.java |   51 +++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 41 insertions(+), 10 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 80706b6..95f0613 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
@@ -1,7 +1,10 @@
 package com.panzhihua.applets.api;
 
+import com.panzhihua.applets.config.WxMaConfiguration;
+import com.panzhihua.applets.weixin.CheckService;
 import com.panzhihua.common.controller.BaseController;
 import com.panzhihua.common.model.dtos.community.*;
+import com.panzhihua.common.model.dtos.community.integral.admin.AddComActIntegralUserDTO;
 import com.panzhihua.common.model.vos.LoginUserInfoVO;
 import com.panzhihua.common.model.vos.R;
 import com.panzhihua.common.model.vos.community.ComActDiscussCommentVO;
@@ -32,14 +35,22 @@
 public class DiscussApi extends BaseController {
     @Resource
     private CommunityService communityService;
+    @Resource
+    private CheckService checkService;
+
 
     @ApiOperation(value = "一起议-新增")
     @PostMapping("discuss")
     public R addDiscuss(@RequestBody @Validated(AddGroup.class) ComActDiscussDTO comActDiscussDTO) {
+//        微信内容审核
+        String discussSubject = comActDiscussDTO.getDiscussSubject();
+        if (!checkService.checkMessage(discussSubject)) {
+            return R.fail("内容违规");
+        }
         Integer type = comActDiscussDTO.getType();
         String voteTitle = comActDiscussDTO.getVoteTitle();
-        List<String> discussOptions = comActDiscussDTO.getDiscussOptions();
-        if (type.intValue()==2 ) {
+        List<ComActDiscussOptionDTO> discussOptions = comActDiscussDTO.getDiscussOptions();
+        if (type.equals(2)) {
             if(ObjectUtils.isEmpty(voteTitle)){
                 return R.fail("投票标题不能为空");
             }
@@ -65,13 +76,16 @@
     @ApiOperation(value = "一起议-分页查询",response = ComActDiscussVO.class)
     @PostMapping("pagediscuss")
     public R pageDiscuss(@RequestBody PageComActDiscussDTO pageComActDiscussDTO) {
-        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
-        pageComActDiscussDTO.setCommunityId(loginUserInfo.getCommunityId());
-        Integer isMy = pageComActDiscussDTO.getIsMy();
-        if (null!=isMy&&isMy.intValue()==1) {
-            pageComActDiscussDTO.setUserId(loginUserInfo.getUserId());
+        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());
+            }
         }
-        pageComActDiscussDTO.setLoginUserId(loginUserInfo.getUserId());
         return communityService.pageDiscussApplets(pageComActDiscussDTO);
     }
 
@@ -87,6 +101,10 @@
             return R.fail("一起议主键不能为空");
         }
         comActDiscussCommentDTO.setUserId(this.getUserId());
+        //议事投票计算积分
+        AddComActIntegralUserDTO integralUserDTO = new AddComActIntegralUserDTO(discussId,AddComActIntegralUserDTO.integralType.cyystp,this.getCommunityId(),this.getUserId());
+        integralUserDTO.setIsComment(1);
+        communityService.addIntegralTradeAdmin(integralUserDTO);
         return communityService.addDiscussComment(comActDiscussCommentDTO);
 
     }
@@ -109,7 +127,11 @@
     @GetMapping("discuss")
     @ApiImplicitParam(name = "id",value = "一起议主键",required = true)
     public R detailDiscuss(@RequestParam("id") Long id) {
-        Long userId = this.getUserId();
+        Long userId = 0L;
+        LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+        if(loginUserInfo != null){
+            userId = loginUserInfo.getUserId();
+        }
         return communityService.detailDiscussApplets(id,userId);
     }
 
@@ -120,7 +142,12 @@
         if (null==id||0==id) {
             return R.fail("一起议主键不能为空");
         }
-        pageComActDiscussCommentDTO.setLoginUserId(this.getUserId());
+        Long userId = 0L;
+        LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+        if(loginUserInfo != null){
+            userId = loginUserInfo.getUserId();
+        }
+        pageComActDiscussCommentDTO.setLoginUserId(userId);
         return communityService.pageDiscussCommentApplets(pageComActDiscussCommentDTO);
     }
 
@@ -149,6 +176,10 @@
         ComActDiscussOptionUserDTO comActDiscussOptionUserDTO=new ComActDiscussOptionUserDTO();
         comActDiscussOptionUserDTO.setDiscussOptionId(id);
         comActDiscussOptionUserDTO.setUserId(this.getUserId());
+        //议事投票计算积分
+        AddComActIntegralUserDTO integralUserDTO = new AddComActIntegralUserDTO(id,AddComActIntegralUserDTO.integralType.cyystp,this.getCommunityId(),this.getUserId());
+        integralUserDTO.setIsComment(2);
+        communityService.addIntegralTradeAdmin(integralUserDTO);
         return communityService.addDiscussOptionUser(comActDiscussOptionUserDTO);
     }
 

--
Gitblit v1.7.1