From 802bbc9b1a26334607b04ab562e62594e383d2c2 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期六, 31 七月 2021 17:58:31 +0800
Subject: [PATCH] 修改bug以及获取天气接口
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/DiscussApi.java | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 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..3e5b65d 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("投票标题不能为空");
}
@@ -87,6 +98,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);
}
@@ -149,6 +164,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