From 08f1b1f1804a8bd833d42f257908d80e88387b55 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 14 三月 2025 11:27:47 +0800
Subject: [PATCH] 3.5增加登录验证、修改密码、人员列表调整
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerActivitiesPeopleServiceImpl.java | 35 +++++++++++++++++++++++++----------
1 files changed, 25 insertions(+), 10 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerActivitiesPeopleServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerActivitiesPeopleServiceImpl.java
index 66dc53b..eaeebd9 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerActivitiesPeopleServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerActivitiesPeopleServiceImpl.java
@@ -61,24 +61,35 @@
}
@Override
- public R grantIntegral(GrantIntegral grantIntegral) {
+ public R grantIntegral(GrantIntegral grantIntegral)
+ {
for (GrantIntegral item: grantIntegral.getPeopleAndGranList() )
{
- if(StringUtils.isEmpty(grantIntegral.getId()))
+ if(StringUtils.isEmpty(item.getId()))
{
return R.fail("奖励发放id不能为空!");
}
+ if(StringUtils.isEmpty(item.getGrantIntegral()))
+ {
+ return R.fail("奖励发放积分不能为空!");
+ }
+
+
+ //用户新增积分
+ LoginUserInfoVO sysUser=userService.getUserInfoByUserId(item.getUserId()).getData();
+
VolunteerActivitiesPeopleVO vla=new VolunteerActivitiesPeopleVO();
vla.setId(item.getId());
+ vla.setUserId(item.getUserId());
vla.setIssuePoints(item.getGrantIntegral());
+ vla.setCommunityId(sysUser.getCommunityId()+"");
vla.setIssueStatus("1");
baseMapper.vapUpdate(vla);
- LoginUserInfoVO sysUser=userService.getUserInfoByUserId(item.getUserId()).getData();
int grant=0;
- if(!StringUtils.isNotEmpty(sysUser.getLoveIntegral()))
+ if(!StringUtils.isEmpty(sysUser.getLoveIntegral()))
{
grant=Integer.valueOf(sysUser.getLoveIntegral());
}
@@ -92,15 +103,19 @@
volunteerIntegralRecordVO.setVolunteerId(item.getVolunteerId());
volunteerIntegralRecordVO.setUserId(item.getUserId());
volunteerIntegralRecordVO.setIType("1");
+ volunteerIntegralRecordVO.setCommunityId(sysUser.getCommunityId()+"");
volunteerIntegralRecordService.insertVolunteer(volunteerIntegralRecordVO);
-
}
-
- VolunteerActivityVO activityVO=new VolunteerActivityVO();
- activityVO.setId(grantIntegral.getActivityId());
- activityVO.setAwardState("1");
- volunteerActivityService.updateById(activityVO);
+ //判断活动奖励是否发放完
+ int num=baseMapper.vapGetUnissuedQuantity(grantIntegral.getActivityId());
+ if(num==0)
+ {
+ VolunteerActivityVO activityVO=new VolunteerActivityVO();
+ activityVO.setId(grantIntegral.getActivityId());
+ activityVO.setAwardState("1");
+ volunteerActivityService.updateById(activityVO);
+ }
return R.ok();
}
--
Gitblit v1.7.1