From b3ad0200bb7dc1d9c2bf75edb14de3f4fde2c40d Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 04 六月 2024 14:02:14 +0800
Subject: [PATCH] 花城 议事投票评论提交报错
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java | 55 +++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 47 insertions(+), 8 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
index af625b8..a082b0a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
@@ -1364,10 +1364,10 @@
ComActActivityInvite activityInvite = comActActivityInviteService.getBaseMapper().selectOne(new LambdaQueryWrapper<ComActActivityInvite>()
.eq(ComActActivityInvite::getActivityId, activityId).eq(ComActActivityInvite::getUserId, userId));
if (isNull(activityInvite)) {
- int count = pbMemberDAO.checkIsPbMember(userId);
- if (count < 1) {
- return R.fail(HttpStatus.NOT_ACCEPTABLE, "您还不是党员");
- }
+// int count = pbMemberDAO.checkIsPbMember(userId);
+// if (count < 1) {
+// return R.fail(HttpStatus.NOT_ACCEPTABLE, "您还不是党员");
+// }
// 查询当前活动下参与志愿者
Integer partyMemberCount = comActActSignDAO.selectCount(new QueryWrapper<ComActActSignDO>().lambda()
.eq(ComActActSignDO::getActivityId, activityId).eq(ComActActSignDO::getSignIdentity, 2)
@@ -1384,10 +1384,10 @@
if (volunteerMax == null) {
return R.fail("活动暂未对志愿者开放");
}
- int count = pbMemberDAO.checkIsVolunteer(userId);
- if (count < 1) {
- return R.fail(HttpStatus.NOT_ACCEPTABLE, "您还不是志愿者");
- }
+// int count = pbMemberDAO.checkIsVolunteer(userId);
+// if (count < 1) {
+// return R.fail(HttpStatus.NOT_ACCEPTABLE, "您还不是志愿者");
+// }
// 查询当前活动下参与志愿者
Integer volunteerCount = comActActSignDAO.selectCount(new QueryWrapper<ComActActSignDO>().lambda()
.eq(ComActActSignDO::getActivityId, activityId).eq(ComActActSignDO::getSignIdentity, 3).eq(ComActActSignDO::getStatus, 1));
@@ -1521,9 +1521,48 @@
if (comActActActRegistDO.getEndTime() != null) {
return R.fail("无法重复签退");
}
+
+ //1.居民 2.党员 3.志愿者
+ switch (comActActActRegistDO.getSignIdentity())
+ {
+ case 1:
+ if(comActActivityDO.getParticipantRewardWay()==2)
+ {
+ int hours = com.panzhihua.common.utlis.DateUtils.getHour(comActActActRegistDO.getStartTime(), comActActActRegistDO.getEndTime());
+ if(hours>1)
+ {
+ rewardIntegral=rewardIntegral * hours;
+ }
+ }
+ break;
+
+ case 2:
+ if(comActActivityDO.getPbRewardWay()==2)
+ {
+ int hours = com.panzhihua.common.utlis.DateUtils.getHour(comActActActRegistDO.getStartTime(), comActActActRegistDO.getEndTime());
+ if(hours>1)
+ {
+ rewardIntegral=rewardIntegral * hours;
+ }
+ }
+ break;
+
+ case 3:
+ if(comActActivityDO.getVolunteerRewardWay()==2)
+ {
+ int hours = com.panzhihua.common.utlis.DateUtils.getHour(comActActActRegistDO.getStartTime(), comActActActRegistDO.getEndTime());
+ if(hours>1)
+ {
+ rewardIntegral=rewardIntegral * hours;
+ }
+ }
+ break;
+ }
+
comActActRegistDO.setId(comActActActRegistDO.getId());
comActActRegistDO.setEndTime(nowDate);
comActActRegistDO.setAward(rewardIntegral);
+
int result = comActActRegistDAO.updateById(comActActRegistDO);
if (result > 0) {
if (isHave) {
--
Gitblit v1.7.1