From 7a6af9f5e879c6743e9475714a703e259c627c09 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期三, 16 三月 2022 13:42:00 +0800
Subject: [PATCH] 党员认证Bug修改
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java | 659 ++++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 509 insertions(+), 150 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 4bc5d82..a3a1f38 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
@@ -1,22 +1,27 @@
package com.panzhihua.service_community.service.impl;
+import static java.util.Objects.isNull;
+import static java.util.Objects.nonNull;
+import static org.apache.commons.lang3.StringUtils.isBlank;
+import static org.apache.commons.lang3.StringUtils.isNotBlank;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.text.DecimalFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.util.*;
-import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import javax.annotation.Resource;
+import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.community.*;
-import com.panzhihua.common.model.vos.screen.ComActPopulationCultureVO;
-import com.panzhihua.service_community.dao.*;
-import com.panzhihua.service_community.model.dos.ComActActEvaluateDO;
-import com.panzhihua.service_community.model.dos.ComActActPictureDO;
import org.apache.commons.lang3.time.DateUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.data.redis.core.ValueOperations;
import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
import org.springframework.util.ObjectUtils;
import com.alibaba.fastjson.JSONObject;
@@ -25,31 +30,27 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.panzhihua.common.constants.HttpStatus;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityListDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityPeopleListDTO;
+import com.panzhihua.common.model.dtos.community.integral.admin.AddComActIntegralUserDTO;
import com.panzhihua.common.model.vos.IndexDataVO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.community.screen.work.ActActivityListVO;
+import com.panzhihua.common.model.vos.user.SysTemplateConfigVO;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.WxUtil;
import com.panzhihua.common.utlis.WxXCXTempSend;
-import com.panzhihua.service_community.dao.ComActActEvaluateDAO;
-import com.panzhihua.service_community.dao.ComActActRegistDAO;
-import com.panzhihua.service_community.dao.ComActActSignDAO;
-import com.panzhihua.service_community.dao.ComActActivityDAO;
-import com.panzhihua.service_community.model.dos.ComActActEvaluateDO;
-import com.panzhihua.service_community.model.dos.ComActActRegistDO;
-import com.panzhihua.service_community.model.dos.ComActActSignDO;
-import com.panzhihua.service_community.model.dos.ComActActivityDO;
+import com.panzhihua.service_community.dao.*;
+import com.panzhihua.service_community.entity.ComActActivityCode;
+import com.panzhihua.service_community.model.dos.*;
+import com.panzhihua.service_community.service.ComActActivityCodeService;
import com.panzhihua.service_community.service.ComActActivityService;
+import com.panzhihua.service_community.service.ComActIntegralUserTradeService;
import lombok.extern.slf4j.Slf4j;
-
-import static java.util.Objects.isNull;
-import static java.util.Objects.nonNull;
-import static org.apache.commons.lang3.StringUtils.isBlank;
-import static org.apache.commons.lang3.StringUtils.isNotBlank;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -77,6 +78,16 @@
private StringRedisTemplate stringRedisTemplate;
@Resource
private ComActActPictureDAO comActActPictureDAO;
+ @Resource
+ private ComActActivityCodeDao comActActivityCodeDao;
+ @Resource
+ private ComBpActivityDAO comBpActivityDAO;
+ @Resource
+ private ComActIntegralUserTradeService comActIntegralUserTradeService;
+ @Resource
+ private ComActActivityCodeService comActActivityCodeService;
+ @Resource
+ private ComActDAO comActDAO;
/**
* 新增社区活动
@@ -87,6 +98,9 @@
*/
@Override
public R addActivity(ComActActivityVO comActActivityVO) {
+ if (comActActivityVO.getHaveIntegralReward().intValue() == 2) {
+ comActActivityVO.setRewardWay(null);
+ }
ComActActivityDO comActActivityDO = new ComActActivityDO();
BeanUtils.copyProperties(comActActivityVO, comActActivityDO);
Integer status = comActActivityVO.getStatus();
@@ -101,10 +115,12 @@
if (status.intValue() == 2) {// 点击‘保存并发布’ 按钮
// 报名结束时间大于当前时间则设置为“进行中”
if (comActActivityVO.getSignUpEnd() != null && now.getTime() < comActActivityVO.getSignUpEnd().getTime()) {
- comActActivityDO.setStatus(4);
+ comActActivityDO.setStatus(3);
}
}
-
+ if(comActActivityVO.getType()==4){
+ comActActivityDO.setIsProject(1);
+ }
boolean save = this.save(comActActivityDO);
if (!save) {
return R.fail();
@@ -121,6 +137,13 @@
comActActPictureDO.setUploadPicture(comActActivityVO.getCover());
comActActPictureDO.setSysFlag(0);
comActActPictureDAO.insert(comActActPictureDO);
+
+ ComActActivityCode comActActivityCode = new ComActActivityCode();
+ comActActivityCode.setActivityId(comActActivityDO.getId().longValue());
+ comActActivityCode.setCreateTime(new Date());
+ comActActivityCode.setType(comActActivityVO.getType());
+ comActActivityCode.setStatus(1);
+ comActActivityCodeService.save(comActActivityCode);
return R.ok(activityId);
}
@@ -148,7 +171,8 @@
try {
WxXCXTempSend util = new WxXCXTempSend();
String accessToken = util.getAppAccessToken();
-
+ ComActDO comActDO=comActDAO.selectById(comActActivityDO.getCommunityId());
+ R<SysTemplateConfigVO> r=userService.selectTemplate(comActDO.getAreaCode(),1);
activitySignVOS.forEach(activitySignVO1 -> {
// 变更社区活动推送订阅消息给用户
WxUtil.sendSubscribeHDBG(activitySignVO1.getOpenid(), accessToken,
@@ -158,19 +182,24 @@
comActActivityDO.getActivityAddr(),
com.panzhihua.common.utlis.DateUtils.format(comActActivityVO.getBeginAt(),
com.panzhihua.common.utlis.DateUtils.ymdhms_format),
- comActActivityVO.getActivityAddr());
+ comActActivityVO.getActivityAddr(),r.getData().getTemplateId());
});
} catch (Exception e) {
log.error("消息推送失败，失败原因：" + e.getMessage());
}
}
}
+ if (comActActivityVO.getHaveIntegralReward().intValue() == 2) {
+ comActActivityVO.setRewardWay(null);
+ }
BeanUtils.copyProperties(comActActivityVO, comActActivityDO);
// 结束时间大于当前时间则设置为“进行中”
Date now = new Date();
- if (comActActivityVO.getSignUpEnd() != null && now.getTime() < comActActivityVO.getSignUpEnd().getTime()) {
- comActActivityDO.setStatus(4);
+ if (comActActivityVO.getSignUpEnd() != null && now.getTime() < comActActivityVO.getSignUpEnd().getTime()
+ && now.getTime() > comActActivityVO.getSignUpBegin().getTime()) {
+ comActActivityDO.setStatus(3);
+ comActActivityDO.setPublishAt(new Date());
}
boolean b = this.updateById(comActActivityDO);
if (b) {
@@ -200,15 +229,15 @@
page.setSize(pageSize);
page.setCurrent(pageNum);
IPage<ComActActivityVO> iPage = comActActivityDAO.pageActivity(page, comActActivityVO);
- List<ComActActivityVO> records = iPage.getRecords();
- if (!ObjectUtils.isEmpty(records)) {
- records.forEach(comActActivityVO1 -> {
- Integer status = comActActivityVO1.getStatus();
- if (status.intValue() == 3) {
- comActActivityVO1.setStatus(4);
- }
- });
- }
+// List<ComActActivityVO> records = iPage.getRecords();
+// if (!ObjectUtils.isEmpty(records)) {
+// records.forEach(comActActivityVO1 -> {
+// Integer status = comActActivityVO1.getStatus();
+// if (status.intValue() == 3) {
+// comActActivityVO1.setStatus(4);
+// }
+// });
+// }
return R.ok(iPage);
}
@@ -221,20 +250,11 @@
*/
@Override
public R releaseActivity(ComActActivityVO comActActivityVO) {
- ComActActivityDO comActActivityDO = new ComActActivityDO();
-// comActActivityDO.setId(comActActivityVO.getId());
-// comActActivityDO.setPublishAt(comActActivityVO.getPublishAt());
-// comActActivityDO.setStatus(comActActivityVO.getStatus());
- comActActivityDO = comActActivityDAO.selectById(comActActivityVO.getId());
+ ComActActivityDO comActActivityDO = comActActivityDAO.selectById(comActActivityVO.getId());
comActActivityDO.setPublishAt(comActActivityVO.getPublishAt());
- if (comActActivityVO.getPublishAt().before(comActActivityDO.getSignUpBegin())) {
- comActActivityVO.setStatus(2);
- }
+ comActActivityDO.setStatus(3);
if (comActActivityVO.getPublishAt().after(comActActivityDO.getSignUpEnd())) {
- comActActivityVO.setStatus(5);
- }
- if (comActActivityVO.getPublishAt().after(comActActivityDO.getSignUpBegin()) && comActActivityVO.getPublishAt().before(comActActivityDO.getSignUpEnd())) {
- comActActivityVO.setStatus(3);
+ comActActivityVO.setStatus(4);
}
int update = comActActivityDAO.updateById(comActActivityDO);
if (update > 0) {
@@ -252,8 +272,7 @@
*/
@Override
public R cancelActivity(ComActActivityVO comActActivityVO) {
- ComActActivityDO comActActivityDO = new ComActActivityDO();
- comActActivityDO.setId(comActActivityVO.getId());
+ ComActActivityDO comActActivityDO = comActActivityDAO.selectById(comActActivityVO.getId());
comActActivityDO.setStatus(comActActivityVO.getStatus());
comActActivityDO.setCancelReason(comActActivityVO.getCancelReason());
int update = comActActivityDAO.updateById(comActActivityDO);
@@ -279,13 +298,33 @@
LambdaQueryWrapper<ComActActSignDO> actSignQuery = new LambdaQueryWrapper<>();
actSignQuery.eq(ComActActSignDO::getActivityId, id);
actSignQuery.eq(ComActActSignDO::getUserId, userId);
+ actSignQuery.eq(ComActActSignDO::getStatus, 1);
ComActActSignDO comActActSignDO = comActActSignDAO.selectOne(actSignQuery);
if (!ObjectUtils.isEmpty(comActActSignDO)) {
comActActivityVO.setIsSign(1);
comActActivityVO.setIsVolunteer(comActActSignDO.getIsVolunteer());
}
+ List<ComActActRegistDO> regList = comActActRegistDAO.selectList(new QueryWrapper<ComActActRegistDO>().lambda()
+ .eq(ComActActRegistDO::getUserId, userId).eq(ComActActRegistDO::getActivityId, id));
+ if (!regList.isEmpty()) {
+ List<ComActActRegistDO> collect = regList.stream().sorted(Comparator.comparing(ComActActRegistDO::getId).reversed()).collect(Collectors.toList());
+ comActActivityVO.setTimes(collect.get(0).getTimes());
+ ComActActRegistDO comActActRegistDO=collect.get(0);
+ if(comActActRegistDO.getType()==2){
+ if(comActActRegistDO.getEndTime()==null){
+ comActActivityVO.setSignType(2);
+ }
+ else {
+ comActActivityVO.setSignType(1);
+ }
+ }
+ }
+ else {
+ comActActivityVO.setSignType(1);
+ }
}
}
+ comActActivityVO.setCodeType(1);
return comActActivityVO;
}
@@ -429,68 +468,130 @@
Long activityId = signactivityVO.getActivityId();
Integer type = signactivityVO.getType();
Long userId = signactivityVO.getUserId();
- Integer isVolunteer = signactivityVO.getIsVolunteer();
+ Integer isVolunteer = 0;
// 查询社区活动
ComActActivityDO actActivityDO = this.baseMapper.selectById(activityId);
if (isNull(actActivityDO)) {
return R.fail("活动不存在");
}
+ if(actActivityDO.getSignUpBegin().after(new Date())){
+ return R.fail("未到报名时间");
+ }
int num = 0;
+ ComActActSignDO comActActSignDO = comActActSignDAO.selectOne(new QueryWrapper<ComActActSignDO>()
+ .lambda().eq(ComActActSignDO::getActivityId, activityId).eq(ComActActSignDO::getUserId, userId));
if (1 == type) {
+ if (nonNull(comActActSignDO) && comActActSignDO.getStatus().equals(1)) {
+ return R.fail("已经报名过了，请勿重复提交");
+ }
+ Integer volunteerMax = actActivityDO.getVolunteerMax();
+ Integer activityType = actActivityDO.getType();
+ Integer residentMax = actActivityDO.getParticipantMax();
R<LoginUserInfoVO> userInfoR = userService.getUserInfoByUserId(String.valueOf(userId));
LoginUserInfoVO loginUserInfoVO =
- JSONObject.parseObject(JSONObject.toJSONString(userInfoR.getData()), LoginUserInfoVO.class);
- boolean userNotVolunteer = !(loginUserInfoVO.getIsVolunteer() == 1);
- if (isVolunteer == 1 && userNotVolunteer) {
- return R.fail("只有志愿者才能报名");
- }
-
- // 查询当前活动下参与志愿者/居民数量
- Integer count = comActActSignDAO.selectCount(new QueryWrapper<ComActActSignDO>().lambda()
- .eq(ComActActSignDO::getActivityId, activityId).eq(ComActActSignDO::getIsVolunteer, isVolunteer));
- if (isVolunteer.equals(1) && actActivityDO.getVolunteerMax() <= count
- && !actActivityDO.getVolunteerMax().equals(-1)) {
- return R.fail("志愿者报名人数已满");
- }
-
- //审查用户是否有该活动报名权限（是否活动指定参与人群）
- String currentUserTags = loginUserInfoVO.getTags();
- String attendPeople = actActivityDO.getAattendPeople();
- if (isNotBlank(attendPeople)) {
- if (isBlank(currentUserTags)) {
- return R.fail("您不是指定参与人群！");
+ JSONObject.parseObject(JSONObject.toJSONString(userInfoR.getData()), LoginUserInfoVO.class);
+ // 查询当前活动下参与居民
+ Integer residentCount = comActActSignDAO.selectCount(new QueryWrapper<ComActActSignDO>().lambda()
+ .eq(ComActActSignDO::getActivityId, activityId).eq(ComActActSignDO::getIsVolunteer, 0).eq(ComActActSignDO::getStatus, 1));
+ if (activityType.equals(1)) {
+ //志愿者活动
+ boolean userIsVolunteer = loginUserInfoVO.getIsVolunteer() == 1;
+ // 查询当前活动下参与志愿者
+ Integer volunteerCount = comActActSignDAO.selectCount(new QueryWrapper<ComActActSignDO>().lambda()
+ .eq(ComActActSignDO::getActivityId, activityId).eq(ComActActSignDO::getIsVolunteer, 1).eq(ComActActSignDO::getStatus, 1));
+ if (userIsVolunteer) {
+ //用户是志愿者以志愿者身份参加
+ if (volunteerMax > volunteerCount || volunteerMax.equals(-1)) {
+ //以志愿者身份报名
+ isVolunteer = 1;
+ } else if (nonNull(residentMax) && (residentMax > residentCount || residentMax.equals(-1))) {
+ //志愿者报名人数已满，再以居民身份报名参加
+ isVolunteer = 0;
+ } else {
+ return R.fail("报名人数已满");
+ }
+ } else {
+ //用户是普通居民已居民身份参加
+ if (nonNull(residentMax) && (residentMax > residentCount || residentMax.equals(-1))) {
+ //以居民身份报名参加
+ isVolunteer = 0;
+ } else if (volunteerMax > volunteerCount || volunteerMax.equals(-1)) {
+ return R.fail(HttpStatus.NOT_ACCEPTABLE, "您还不是志愿者哦～");
+ } else {
+ return R.fail("报名人数已满");
+ }
}
- List<String> currentUserTagList = Arrays.asList(currentUserTags.split(","));
- boolean checkResult = currentUserTagList.stream().anyMatch(currentUserTag -> attendPeople.contains(currentUserTag));
- if (!checkResult) {
- return R.fail("您不是指定参与人群！");
+ } else {
+ //普通居民活动
+ //审查用户是否有该活动报名权限（是否活动指定参与人群）
+ String currentUserTags = loginUserInfoVO.getTags();
+ String attendPeople = actActivityDO.getAattendPeople();
+ if (isNotBlank(attendPeople)) {
+ if (isBlank(currentUserTags)) {
+ currentUserTags = "全部居民";
+ } else {
+ currentUserTags = currentUserTags.concat(",全部居民");
+ }
+ List<String> currentUserTagList = Arrays.asList(currentUserTags.split(","));
+ boolean checkResult = currentUserTagList.stream().anyMatch(currentUserTag -> attendPeople.contains(currentUserTag));
+ if (!checkResult) {
+ return R.fail("您不是指定参与人群！");
+ }
+ }
+ if (residentMax > residentCount || residentMax.equals(-1)) {
+ //用户参加居民活动
+ isVolunteer = 0;
+ } else {
+ return R.fail("报名人数已满");
}
}
-
- if (isVolunteer.equals(0) && actActivityDO.getParticipantMax() <= count
- && !actActivityDO.getParticipantMax().equals(-1)) {
- return R.fail("居民报名人数已满");
- }
-
- ComActActSignDO comActActSignDO = new ComActActSignDO();
- comActActSignDO.setActivityId(activityId);
- comActActSignDO.setUserId(userId);
- comActActSignDO.setIsVolunteer(isVolunteer);
- try {
+ if (nonNull(comActActSignDO)) {
+ comActActSignDO.setStatus(1);
+ comActActSignDO.setCreateAt(new Date());
+ comActActSignDO.setReason(null);
+ comActActSignDO.setIsVolunteer(isVolunteer);
+ comActActSignDO.setTimes(comActActSignDO.getTimes()+1);
+ num = comActActSignDAO.updateById(comActActSignDO);
+ } else {
+ comActActSignDO = new ComActActSignDO();
+ comActActSignDO.setActivityId(activityId);
+ comActActSignDO.setUserId(userId);
+ comActActSignDO.setIsVolunteer(isVolunteer);
+ comActActSignDO.setTimes(1);
num = comActActSignDAO.insert(comActActSignDO);
- } catch (Exception e) {
- if (e.getMessage().contains("unique_activity_id_user_id")) {
- return R.fail("已经报名过了，请勿重复提交");
- }
- log.error(e.getMessage());
}
} else {
- num = comActActSignDAO
- .delete(new QueryWrapper<ComActActSignDO>().lambda().eq(ComActActSignDO::getUserId, userId)
- .eq(ComActActSignDO::getActivityId, activityId).eq(ComActActSignDO::getIsVolunteer, isVolunteer));
+ Integer regTimes = comActActRegistDAO.selectCount(new QueryWrapper<ComActActRegistDO>().lambda()
+ .eq(ComActActRegistDO::getActivityId, activityId).eq(ComActActRegistDO::getUserId, userId).eq(ComActActRegistDO::getType, 1));
+ Integer canCancel = actActivityDO.getCanCancel();
+ if (nonNull(canCancel) && canCancel.equals(2)) {
+ return R.fail("该活动暂不支持取消");
+ }
+ if (regTimes > 0) {
+ return R.fail("您已参与活动，不可取消");
+ }
+ if (isNull(signactivityVO.getReason())) {
+ return R.fail("缺少取消原因");
+ }
+ if (isNull(comActActSignDO)) {
+ return R.fail("未报名");
+ }
+ comActActSignDO.setStatus(0);
+ comActActSignDO.setReason(signactivityVO.getReason());
+ num = comActActSignDAO.updateById(comActActSignDO);
+ if (num > 0) {
+ AddComActIntegralUserDTO addComActIntegralUserDTO = new AddComActIntegralUserDTO();
+ addComActIntegralUserDTO.setUserId(userId);
+ addComActIntegralUserDTO.setIntegralType(8);
+ addComActIntegralUserDTO.setActivityType(actActivityDO.getType());
+ addComActIntegralUserDTO.setIsVolunteer(comActActSignDO.getIsVolunteer());
+ addComActIntegralUserDTO.setCommunityId(actActivityDO.getCommunityId());
+ addComActIntegralUserDTO.setServiceId(activityId);
+ comActIntegralUserTradeService.addIntegralTradeAdmin(addComActIntegralUserDTO);
+ }
}
if (num > 0) {
- return R.ok();
+ return R.ok(isVolunteer);
}
return R.fail();
}
@@ -500,41 +601,60 @@
*
* @param userId
* 用户id
+ * @param status
* @return 活动列表
*/
@Override
- public R listActivity(Long userId) {
- List<ComActActSignDO> comActActSignDOS = comActActSignDAO
- .selectList(new QueryWrapper<ComActActSignDO>().lambda().eq(ComActActSignDO::getUserId, userId));
- if (ObjectUtils.isEmpty(comActActSignDOS)) {
- return R.fail();
+ public R listActivity(Long userId, Integer status,Integer type) {
+ List<ActivitySignVO> activitySignVOList = comActActSignDAO.selectList(userId);
+ if (ObjectUtils.isEmpty(activitySignVOList)) {
+ return R.ok();
}
- List<Long> longs = comActActSignDOS.stream().map(comActActSignDO -> comActActSignDO.getActivityId())
+ List<Long> longs = activitySignVOList.stream().map(activitySignVO -> activitySignVO.getActivityId())
.collect(Collectors.toList());
List<ComActActivityDO> comActActivityDOS = comActActivityDAO.selectBatchIds(longs);
List<ComActActivityVO> comActActivityVOS = new ArrayList<>();
- comActActivityDOS.forEach(comActActivityDO -> {
- ComActActivityVO comActActivityVO = new ComActActivityVO();
- BeanUtils.copyProperties(comActActivityDO, comActActivityVO);
- List<ComActActSignDO> collect = comActActSignDOS.stream()
- .filter(comActActSignDO -> comActActSignDO.getActivityId().equals(comActActivityVO.getId())).limit(1)
- .collect(Collectors.toList());
- ComActActSignDO comActActSignDO = collect.get(0);
- Integer isVolunteer = comActActSignDO.getIsVolunteer();
- if (isVolunteer.intValue() == 1) {
- comActActivityVO.setType(1);
- } else {
- comActActivityVO.setType(2);
+ if (nonNull(status)) {
+ if(status.equals(4)){
+ comActActivityDOS = comActActivityDOS.stream()
+ .filter(activityDO -> activityDO.getStatus().equals(3)||activityDO.getStatus().equals(4)).collect(Collectors.toList());
+ }else{
+ comActActivityDOS = comActActivityDOS.stream()
+ .filter(activityDO -> activityDO.getStatus().equals(status)).collect(Collectors.toList());
}
- Integer status = comActActivityVO.getStatus();
- if (status.intValue() == 3) {
- comActActivityVO.setStatus(4);
- }
- comActActivityVO.setSingDate(comActActSignDOS.stream()
- .filter(comActActSignDO1 -> comActActSignDO1.getActivityId().equals(comActActivityVO.getId()))
- .collect(Collectors.toList()).get(0).getCreateAt());
- comActActivityVOS.add(comActActivityVO);
- });
+ }
+ if(!isNull(type)){
+ comActActivityDOS=comActActivityDOS.stream().filter(comActActivityDO -> comActActivityDO.getType().equals(type)).collect(Collectors.toList());
+ }
+ if (!comActActivityDOS.isEmpty()) {
+ comActActivityDOS.forEach(comActActivityDO -> {
+ ComActActivityVO comActActivityVO = new ComActActivityVO();
+ BeanUtils.copyProperties(comActActivityDO, comActActivityVO);
+ List<ActivitySignVO> collect = activitySignVOList.stream()
+ .filter(activitySignVO -> activitySignVO.getActivityId().equals(comActActivityVO.getId()))
+ .collect(Collectors.toList());
+ comActActivityVO.setSignCount(collect.size());
+ comActActivityVO.setIsComment(0);
+ ActivitySignVO activitySignVO = collect.get(0);
+ Integer activityStatus = comActActivityVO.getStatus();
+ if (activityStatus.intValue() == 3) {
+ comActActivityVO.setStatus(4);
+ }
+ Date createAt = null;
+ try {
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ createAt = simpleDateFormat.parse(activitySignVO.getCreateAt());
+ } catch (ParseException e) {
+ log.error("时间转换异常【{}】", e.getMessage());
+ }
+ comActActivityVO.setSingDate(createAt);
+ comActActivityVO.setTimes(activitySignVO.getTimes());
+ Integer totalAward = comActActRegistDAO.selectTotalAwardWithRegist(activitySignVO.getActivityId(), userId);
+ comActActivityVO.setAward(totalAward);
+ comActActivityVO.setActivitySignVOList(collect);
+ comActActivityVOS.add(comActActivityVO);
+ });
+ }
return R.ok(comActActivityVOS);
}
@@ -599,15 +719,15 @@
int num = comActActivityDAO.updateStatusToNotBegin();
log.info("定时任务--修改社区活动发布状态活动数量【{}】", num);
// 修改报名状态 变为报名中
- int num1 = comActActivityDAO.updateStatusToBeginSign();
- log.info("定时任务--修改社区活动报名状态活动数量【{}】", num1);
+// int num1 = comActActivityDAO.updateStatusToBeginSign();
+// log.info("定时任务--修改社区活动报名状态活动数量【{}】", num1);
+ int num3 = comActActivityDAO.updateStatusToBeginAfterSingEnd();
+ log.info("定时任务--报名结束修改社区活动进行状态活动数量【{}】", num3);
// 查询已经结束的活动，需要计算积分
List<Long> activityEndIds = comActActivityDAO.getActivityEndIds();
// 修改进行状态 变为进行中或者已结束
int num2 = comActActivityDAO.updateStatusToBeginActiveOrEnd();
log.info("定时任务--修改社区活动进行状态活动数量【{}】", num2);
- int num3 = comActActivityDAO.updateStatusToBeginAfterSingEnd();
- log.info("定时任务--报名结束修改社区活动进行状态活动数量【{}】", num3);
return R.ok(activityEndIds);
}
@@ -635,11 +755,20 @@
iPage.getRecords().forEach(vo ->{
List<ComActActEvaluateDO> comActActEvaluateDOList = comActActEvaluateDAO
.selectList(new QueryWrapper<ComActActEvaluateDO>().lambda().eq(ComActActEvaluateDO::getActivityId, vo.getId()));
- if (comActActEvaluateDOList != null && comActActEvaluateDOList.size() != 0) {
+ if (comActActEvaluateDOList != null && comActActEvaluateDOList.size() > 0) {
+ BigDecimal starNum = BigDecimal.ZERO;
//总星级
- int starNum = comActActEvaluateDOList.stream().mapToInt(ComActActEvaluateDO::getStarLevel).sum();
- //评分星级=总星级/总评价人数
- vo.setEvaluateLevel(Double.valueOf(starNum/comActActEvaluateDOList.size()));
+ for (ComActActEvaluateDO evaluateDO:comActActEvaluateDOList) {
+ starNum = starNum.add(BigDecimal.valueOf(evaluateDO.getStarLevel()==null?0:evaluateDO.getStarLevel()));
+ }
+ //评分星级(如果无评分默认5分)=总星级/总评价人数
+ if(starNum.compareTo(BigDecimal.ZERO) == 0){
+ vo.setEvaluateLevel(BigDecimal.valueOf(5));
+ }else{
+ vo.setEvaluateLevel(starNum.divide(BigDecimal.valueOf(comActActEvaluateDOList.size()),2, RoundingMode.HALF_UP));
+ }
+ }else{
+ vo.setEvaluateLevel(BigDecimal.valueOf(5));
}
});
return R.ok(iPage);
@@ -720,12 +849,14 @@
// 查询所有即将开始的活动
List<ComActActivityDO> actActivityList = comActActivityDAO.selectList(new QueryWrapper<ComActActivityDO>()
.lambda().le(ComActActivityDO::getBeginAt, DateUtils.addDays(new Date(), 1))
- .ge(ComActActivityDO::getBeginAt, new Date()));
+ .ge(ComActActivityDO::getBeginAt, new Date()).notIn(ComActActivityDO::getStatus,5,6));
if (!actActivityList.isEmpty()) {
WxXCXTempSend util = new WxXCXTempSend();
try {
String accessToken = util.getAppAccessToken();
actActivityList.forEach(actActivity -> {
+ ComActDO comActDO=comActDAO.selectById(actActivity.getCommunityId());
+ R<SysTemplateConfigVO> r=userService.selectTemplate(comActDO.getAreaCode(),9);
// 查询报名活动人员列表
List<ComActActSignDO> actSignList = comActActSignDAO.selectList(new QueryWrapper<ComActActSignDO>()
.lambda().eq(ComActActSignDO::getActivityId, actActivity.getId()));
@@ -733,12 +864,13 @@
// 查询用户openId
Map<String, String> map = comActActSignDAO.getUserOpenId(actSign.getUserId());
if (map != null) {
+
String openid = map.get("openid");
// 推送消息
WxUtil.sendSubscribeHDJJKS(openid, accessToken, actActivity.getActivityName(),
com.panzhihua.common.utlis.DateUtils.format(actActivity.getBeginAt(),
com.panzhihua.common.utlis.DateUtils.ymdhms_format),
- actActivity.getActivityAddr(), actSignList.size() + "");
+ actActivity.getActivityAddr(), actSignList.size() + "",r.getData().getTemplateId());
}
});
@@ -773,29 +905,158 @@
@Override
public R activitySignIn(ComActActRegistVO comActActRegistVO) {
Long activityId = comActActRegistVO.getActivityId();
+ Long userId = comActActRegistVO.getUserId();
if (isNull(activityId)) {
return R.fail("签到所属活动id不能为空！");
}
- ComActActivityDO comActActivityDO = comActActivityDAO.selectById(activityId);
- if (isNull(comActActivityDO)) {
- return R.fail("活动不存在！");
- }
- Long userId = comActActRegistVO.getUserId();
- String activitySignInKey = String.join(DELIMITER, ACTIVITY_SIGN_IN, userId.toString(), activityId.toString());
- if (stringRedisTemplate.hasKey(activitySignInKey)) {
- return R.fail("你已签到，如要再次签到请三十分钟后尝试！");
- }
- ComActActRegistDO comActActRegistDO = new ComActActRegistDO();
- comActActRegistDO.setActivityId(activityId);
- comActActRegistDO.setUserId(userId);
- comActActRegistDO.setIsVolunteer(comActActRegistVO.getIsVolunteer());
- comActActRegistDO.setCreateAt(new Date());
- int result = comActActRegistDAO.insert(comActActRegistDO);
- if (result > 0) {
- ValueOperations<String, String> opsForValue = stringRedisTemplate.opsForValue();
- opsForValue.set(activitySignInKey, "", 1800L, TimeUnit.SECONDS);
- }
- return R.ok();
+ ComActActivityDO comActActivityDO = comActActivityDAO.selectById(activityId);
+ if (isNull(comActActivityDO)) {
+ return R.fail("活动不存在！");
+ }
+
+ ComActActSignDO comActActSignDO = comActActSignDAO.selectOne(new QueryWrapper<ComActActSignDO>().lambda()
+ .eq(ComActActSignDO::getActivityId, activityId).eq(ComActActSignDO::getUserId, userId).eq(ComActActSignDO::getStatus, 1));
+ if (isNull(comActActSignDO)) {
+ return R.fail("活动未报名");
+ }
+
+ Date beginAt = comActActivityDO.getBeginAt();
+ Date endAt = comActActivityDO.getEndAt();
+ Date nowDate = new Date();
+ if (nowDate.before(beginAt) || nowDate.after(endAt)) {
+ return R.fail("不在活动时间范围内");
+ }
+ Integer haveIntegralReward = comActActivityDO.getHaveIntegralReward();
+ boolean isHave = nonNull(haveIntegralReward) && haveIntegralReward.equals(1);
+
+// String activitySignInKey = String.join(DELIMITER, ACTIVITY_SIGN_IN, userId.toString(), activityId.toString());
+// if (stringRedisTemplate.hasKey(activitySignInKey)) {
+// return R.fail("你已签到，如要再次签到请三十分钟后尝试！");
+// }
+ ComActActRegistDO comActActRegistDO = new ComActActRegistDO();
+ if(comActActRegistVO.getSignType()!=null&&comActActRegistVO.getSignType()==2){
+ ComActActRegistDO comActActActRegistDO=comActActRegistDAO.selectOne(new QueryWrapper<ComActActRegistDO>()
+ .lambda().eq(ComActActRegistDO::getActivityId, activityId).eq(ComActActRegistDO::getUserId, userId).eq(ComActActRegistDO::getCodeId,comActActRegistVO.getCodeId()));
+ if(comActActActRegistDO==null){
+ return R.fail("未签到无法签退");
+ }
+ if(comActActActRegistDO.getEndTime()!=null){
+ return R.fail("无法重复签退");
+ }
+ comActActRegistDO.setId(comActActActRegistDO.getId());
+ comActActRegistDO.setEndTime(new Date());
+ int result=comActActRegistDAO.updateById(comActActRegistDO);
+ if (result > 0) {
+ if (isHave) {
+ AddComActIntegralUserDTO addComActIntegralUserDTO=new AddComActIntegralUserDTO();
+ addComActIntegralUserDTO.setUserId(userId);
+ addComActIntegralUserDTO.setIntegralType(6);
+ addComActIntegralUserDTO.setActivityType(2);
+ addComActIntegralUserDTO.setCommunityId(comActActivityDO.getCommunityId());
+ addComActIntegralUserDTO.setServiceId(activityId);
+ comActIntegralUserTradeService.addIntegralTradeAdmin(addComActIntegralUserDTO);
+ return R.ok(comActActivityDO.getRewardIntegral());
+ } else {
+ return R.ok();
+ }
+ }
+ }
+ else {
+ int signDayCount = comActActRegistDAO.selectCount(new QueryWrapper<ComActActRegistDO>()
+ .lambda().eq(ComActActRegistDO::getActivityId, activityId).eq(ComActActRegistDO::getUserId, userId).eq(ComActActRegistDO::getCodeId,comActActRegistVO.getCodeId()));
+ int signAllCount = comActActRegistDAO.selectCount(new QueryWrapper<ComActActRegistDO>()
+ .lambda().eq(ComActActRegistDO::getActivityId, activityId).eq(ComActActRegistDO::getUserId, userId));
+ if (signDayCount > 0) {
+ return R.fail("请扫描新的签到码");
+ }
+ if (isHave) {
+ int limit = comActActivityDO.getLimit().intValue();
+ if(limit != -1 && signAllCount >= limit){
+ return R.fail("签到次数上限");
+ }
+ }
+ comActActRegistDO.setActivityId(activityId);
+ comActActRegistDO.setStartTime(new Date());
+ comActActRegistDO.setType(comActActivityDO.getType());
+ comActActRegistDO.setUserId(userId);
+ comActActRegistDO.setIsVolunteer(comActActSignDO.getIsVolunteer());
+ comActActRegistDO.setCreateAt(nowDate);
+ comActActRegistDO.setCodeId(comActActRegistVO.getCodeId());
+ comActActRegistDO.setAward(isHave ? comActActivityDO.getRewardIntegral() : 0);
+ comActActRegistDO.setPosition(comActActRegistVO.getPosition());
+ comActActRegistDO.setTimes(signAllCount+1);
+ int result = comActActRegistDAO.insert(comActActRegistDO);
+ if (result > 0&&comActActivityDO.getType()!=3) {
+ if (isHave) {
+ boolean isVolunteerAct = comActActivityDO.getVolunteerMax() != 0;
+ AddComActIntegralUserDTO addComActIntegralUserDTO=new AddComActIntegralUserDTO();
+ addComActIntegralUserDTO.setUserId(userId);
+ addComActIntegralUserDTO.setIntegralType(isVolunteerAct ? 5 : 4);
+ addComActIntegralUserDTO.setActivityType(1);
+ addComActIntegralUserDTO.setIsVolunteer(comActActSignDO.getIsVolunteer());
+ addComActIntegralUserDTO.setCommunityId(comActActivityDO.getCommunityId());
+ addComActIntegralUserDTO.setServiceId(activityId);
+ comActIntegralUserTradeService.addIntegralTradeAdmin(addComActIntegralUserDTO);
+ return R.ok(comActActivityDO.getRewardIntegral());
+ } else {
+ return R.ok();
+ }
+ }
+ else {
+ return R.ok();
+ }
+ }
+ return R.fail("网络错误，请重试");
+// else {
+// ComPbActivityDO comPbActivityDO=comBpActivityDAO.selectById(activityId);
+// if (isNull(comPbActivityDO)) {
+// return R.fail("活动不存在！");
+// }
+//
+// Date beginAt = comPbActivityDO.getActivityTimeBegin();
+// Date endAt = comPbActivityDO.getActivityTimeEnd();
+// Date nowDate = new Date();
+// if (nowDate.before(beginAt) || nowDate.after(endAt)) {
+// return R.fail("不在活动时间范围内");
+// }
+//
+// int signDayCount = comActActRegistDAO.selectCount(new QueryWrapper<ComActActRegistDO>()
+// .lambda().eq(ComActActRegistDO::getActivityId, activityId).eq(ComActActRegistDO::getUserId, userId).eq(ComActActRegistDO::getCodeId,comActActRegistVO.getCodeId()));
+// int signAllCount = comActActRegistDAO.selectCount(new QueryWrapper<ComActActRegistDO>()
+// .lambda().eq(ComActActRegistDO::getActivityId, activityId).eq(ComActActRegistDO::getUserId, userId));
+// if (signDayCount >= 0) {
+// return R.fail("请扫描新的签到码");
+// }
+// int limit = comPbActivityDO.getLimit().intValue();
+// if(limit != -1 && signAllCount >= limit){
+// return R.fail("签到次数上限");
+// }
+//
+// ComActActRegistDO comActActRegistDO = new ComActActRegistDO();
+// comActActRegistDO.setActivityId(activityId);
+// comActActRegistDO.setType(2);
+// comActActRegistDO.setUserId(userId);
+// comActActRegistDO.setIsVolunteer(comActActRegistVO.getIsVolunteer());
+// comActActRegistDO.setCreateAt(nowDate);
+// comActActRegistDO.setCodeId(comActActRegistVO.getCodeId());
+// comActActRegistDO.setAward(comPbActivityDO.getRewardIntegral());
+// comActActRegistDO.setPosition(comActActRegistVO.getPosition());
+// comActActRegistDO.setTimes(signAllCount+1);
+// int result = comActActRegistDAO.insert(comActActRegistDO);
+// if (result > 0) {
+// AddComActIntegralUserDTO addComActIntegralUserDTO=new AddComActIntegralUserDTO();
+// addComActIntegralUserDTO.setUserId(userId);
+// addComActIntegralUserDTO.setIntegralType(8);
+// addComActIntegralUserDTO.setActivityType(2);
+// addComActIntegralUserDTO.setCommunityId(comPbActivityDO.getCommunityId());
+// addComActIntegralUserDTO.setServiceId(activityId);
+// comActIntegralUserTradeService.addIntegralTradeAdmin(addComActIntegralUserDTO);
+//// ValueOperations<String, String> opsForValue = stringRedisTemplate.opsForValue();
+//// opsForValue.set(activitySignInKey, "", 1800L, TimeUnit.SECONDS);
+// return R.ok();
+// }
+// return R.fail("网络错误，请重试");
+// }
}
/**
@@ -816,4 +1077,102 @@
});
return R.ok(comActActRegistVOS);
}
+
+ /**
+ * 获取活动报名签到记录
+ * @param id 活动主键id
+ * @return
+ */
+ @Override
+ public R listSignInRecord(Long id) {
+ return R.ok(comActActSignDAO.listSignInRecord(id));
+ }
+
+ /**
+ * 活动签到记录
+ * @param id 活动主键
+ * @param userId 用户id
+ * @return
+ */
+ @Override
+ public R listRegistRecord(Long id, Long userId) {
+ return R.ok(comActActRegistDAO.listRegistRecord(id, userId));
+ }
+
+ /**
+ * 获取活动类型（目前只有志愿者活动需要获取）
+ * @param communityId
+ * @param type
+ * @return
+ */
+ @Override
+ public R listActivityType(Long communityId, Integer type) {
+ return R.ok(this.baseMapper.listActivityType(communityId, type));
+ }
+
+ /**
+ * 添加活动类型
+ * @param comActActivityTypeVO
+ * @return
+ */
+ @Override
+ public R addActivityType(ComActActivityTypeVO comActActivityTypeVO) {
+ try {
+ this.baseMapper.addActivityType(comActActivityTypeVO);
+ } catch (Exception e) {
+ log.error("添加活动类型错误【{}】", e.getMessage());
+ return R.fail("活动类型已存在");
+ }
+ return R.ok();
+ }
+
+ @Override
+ public String getActBelongRegionCode(Long communityId) {
+ return baseMapper.getActBelongRegionCode(communityId);
+ }
+
+ @Override
+ public R partyMemberCount(Long communityId, String year) {
+ PartyActivityStatics partyActivityStatics=this.comActActivityDAO.selectActivityStatics(communityId);
+ List<PartyActivityTypeChart> partyActivityTypeChart=this.comActActivityDAO.selectActivityChart(communityId);
+ if(partyActivityStatics.getActivityCount()!=null&&partyActivityStatics.getActivityCount()>0){
+ if(!CollectionUtils.isEmpty(partyActivityTypeChart)){
+ partyActivityTypeChart.forEach(partyActivityTypeChart1 -> {
+ partyActivityTypeChart1.setPercent(partyActivityTypeChart1.getCount()/partyActivityStatics.getActivityCount());
+ });
+ }
+ }
+ partyActivityStatics.setPartyActivityTypeChartList(partyActivityTypeChart);
+ partyActivityStatics.setPartyActivityLines(getPoints(communityId,year));
+ return R.ok(partyActivityStatics);
+ }
+
+ @Override
+ public R partyMemberDetail(CommonPage commonPage) {
+ return R.ok(comActActivityDAO.partyMemberDetail(new Page<>(commonPage.getPage(),commonPage.getSize()),commonPage));
+ }
+
+ @Override
+ public R exportPartyMemberDetail(CommonPage commonPage) {
+ return R.ok(comActActivityDAO.exportPartyMemberDetail(commonPage));
+ }
+
+ public List<PartyActivityLine> getPoints(Long communityId,String year){
+ List<PartyActivityLine> partyActivityLines=new ArrayList<>();
+ for(int i=1;i<=12;i++){
+ String x="";
+ if(i<10){
+ x="0"+i;
+ }
+ else {
+ x=i+"";
+ }
+ PartyActivityLine partyActivityLine=new PartyActivityLine();
+ partyActivityLine.setX(i+"月");
+ Integer y=this.comActActivityDAO.selectActivityLine(communityId,year,x);
+ partyActivityLine.setY(y);
+ partyActivityLines.add(partyActivityLine);
+ }
+ return partyActivityLines;
+ }
}
--
Gitblit v1.7.1