From dde29a93461a81940dbef9a65c60fa2690f2097e Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期六, 31 七月 2021 10:15:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into txb

---
 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/DiscussApi.java |    9 +++++++++
 1 files changed, 9 insertions(+), 0 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 ef2cd14..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
@@ -4,6 +4,7 @@
 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;
@@ -97,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);
 
     }
@@ -159,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