springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/GrantIntegral.java
New file @@ -0,0 +1,32 @@ package com.panzhihua.common.model.vos.community; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.List; @Data @ApiModel public class GrantIntegral { @ApiModelProperty("活动id") private String activityId; @ApiModelProperty("社区id") private String communityId; @ApiModelProperty("主键id") private String id; @ApiModelProperty("志愿者id") private String volunteerId; @ApiModelProperty("发放积分") private String grantIntegral="0"; @ApiModelProperty("活动id") private List<GrantIntegral> peopleAndGranList; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -11412,7 +11412,13 @@ public R vapDelete(@RequestParam("id") String id); /** * 志愿者活动 奖励发放 * @param grantIntegral * @return */ @PostMapping("/grantIntegral") public R grantIntegral(@RequestBody GrantIntegral grantIntegral); springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/VolunteerActivitiesPeopleApi.java
@@ -2,6 +2,7 @@ import com.panzhihua.common.controller.BaseController; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.GrantIntegral; import com.panzhihua.common.model.vos.community.VolunteerActivitiesPeopleVO; import com.panzhihua.common.service.community.CommunityService; import com.panzhihua.common.utlis.StringUtils; @@ -138,7 +139,25 @@ return volunteerActivitiesPeople.vapDelete(id); } /** * 志愿者活动 奖励发放 * @param grantIntegral * @return */ @PostMapping("/grantIntegral") public R grantIntegral(@RequestBody GrantIntegral grantIntegral) { if(grantIntegral==null) { return R.fail("参数不能为空"); } if(grantIntegral.getPeopleAndGranList()==null || grantIntegral.getPeopleAndGranList().size()<=0 ) { return R.fail("奖励积分人员不能为空"); } return volunteerActivitiesPeople.grantIntegral(grantIntegral); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VolunteerActivitiesPeopleApi.java
@@ -2,6 +2,7 @@ import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.GrantIntegral; import com.panzhihua.common.model.vos.community.VolunteerActivitiesPeopleVO; import com.panzhihua.service_community.service.VolunteerActivitiesPeopleService; import lombok.extern.slf4j.Slf4j; @@ -16,6 +17,7 @@ { @Resource private VolunteerActivitiesPeopleService volunteerActivitiesPeople; /** * 志愿者单个详情 @@ -89,6 +91,26 @@ return R.fail(); } /** * 志愿者活动 奖励发放 * @param grantIntegral * @return */ @PostMapping("/grantIntegral") public R grantIntegral(@RequestBody GrantIntegral grantIntegral) { if(grantIntegral==null) { return R.fail("参数不能为空"); } if(grantIntegral.getPeopleAndGranList()==null || grantIntegral.getPeopleAndGranList().size()<=0 ) { return R.fail("奖励积分人员不能为空"); } return volunteerActivitiesPeople.grantIntegral(grantIntegral); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/VolunteerActivitiesPeopleService.java
@@ -1,5 +1,7 @@ package com.panzhihua.service_community.service; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.GrantIntegral; import com.panzhihua.common.model.vos.community.VolunteerActivitiesPeopleVO; import com.panzhihua.service_community.entity.VolunteerActivitiesPeople; @@ -43,4 +45,12 @@ * @return */ int vapDelete(String id); /** * 积分发放 * @return */ R grantIntegral(GrantIntegral grantIntegral); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerActivitiesPeopleServiceImpl.java
@@ -1,13 +1,21 @@ package com.panzhihua.service_community.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO; import com.panzhihua.common.model.vos.community.GrantIntegral; import com.panzhihua.common.model.vos.community.VolunteerActivitiesPeopleVO; import com.panzhihua.common.model.vos.community.VolunteerActivityVO; import com.panzhihua.common.utlis.StringUtils; import com.panzhihua.service_community.dao.VolunteerActivitiesPeopleDao; import com.panzhihua.service_community.entity.VolunteerActivitiesPeople; import com.panzhihua.service_community.service.ComMngVolunteerMngService; import com.panzhihua.service_community.service.VolunteerActivitiesPeopleService; import com.panzhihua.service_community.service.VolunteerActivityService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.List; @Slf4j @@ -15,6 +23,13 @@ public class VolunteerActivitiesPeopleServiceImpl extends ServiceImpl<VolunteerActivitiesPeopleDao, VolunteerActivitiesPeople> implements VolunteerActivitiesPeopleService { @Resource private ComMngVolunteerMngService comMngVolunteerMngService; @Resource private VolunteerActivityService volunteerActivityService; @Override public VolunteerActivitiesPeople vapGetById(String id) @@ -42,5 +57,42 @@ return baseMapper.vapDelete(id); } @Override public R grantIntegral(GrantIntegral grantIntegral) { for (GrantIntegral item: grantIntegral.getPeopleAndGranList() ) { if(StringUtils.isEmpty(grantIntegral.getId())) { return R.fail("奖励发放id不能为空!"); } VolunteerActivitiesPeopleVO vla=new VolunteerActivitiesPeopleVO(); vla.setId(item.getId()); vla.setIssuePoints(item.getGrantIntegral()); vla.setIssueStatus("1"); baseMapper.vapUpdate(vla); ComMngVolunteerMngVO comMngVolunteerMngVO=new ComMngVolunteerMngVO(); comMngVolunteerMngVO.setId(Long.valueOf(item.getVolunteerId())); int grant=0; if(!StringUtils.isNotEmpty(comMngVolunteerMngVO.getLoveIntegral())) { grant=Integer.valueOf(comMngVolunteerMngVO.getLoveIntegral()); } grant+=Integer.valueOf(item.getGrantIntegral()); comMngVolunteerMngVO.setLoveIntegral(grant+""); comMngVolunteerMngService.putVolunteer(comMngVolunteerMngVO); } VolunteerActivityVO activityVO=new VolunteerActivityVO(); activityVO.setId(grantIntegral.getActivityId()); activityVO.setAwardState("1"); volunteerActivityService.updateById(activityVO); return R.ok(); } }