From 29c3367d8c8f9777bde6a86fa26c86d19a35bc07 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 19 八月 2021 15:18:25 +0800
Subject: [PATCH] Merge branch 'zzj' of http://182.151.2.19:9380/root/zhihuishequ into zzj
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActIntegralUserTradeServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActIntegralUserTradeServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActIntegralUserTradeServiceImpl.java
index e2a729b..7518a2d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActIntegralUserTradeServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActIntegralUserTradeServiceImpl.java
@@ -206,7 +206,7 @@
ComActDiscussDO discussDO = comActDiscussDAO.selectById(serviceId);
if(discussDO != null){
remark.append("【");
- remark.append(discussDO.getVoteTitle());
+ remark.append(discussDO.getDiscussSubject());
remark.append("】");
}
}else{
@@ -258,13 +258,13 @@
return R.fail("未查询到用户信息,记录积分失败");
}
//判断调查问卷调查的对象是什么身份，如果是党员和志愿者两种身份，则记录志愿者积分
- if(questnaireDO.getForParty() && integralUser.getIsPartymember().equals(1)){
+ if(questnaireDO.getForParty().equals(1) && integralUser.getIsPartymember().equals(1)){
identityType = 2;
- if(questnaireDO.getForVolunteer() && integralUser.getIsVolunteer().equals(1)){
+ if(questnaireDO.getForVolunteer().equals(1) && integralUser.getIsVolunteer().equals(1)){
identityType = 3;
}
}
- if(questnaireDO.getForVolunteer() && integralUser.getIsVolunteer().equals(1)){
+ if(questnaireDO.getForVolunteer().equals(1) && integralUser.getIsVolunteer().equals(1)){
identityType = 3;
}
remark.append("参与调查问卷奖励积分");
--
Gitblit v1.7.1