From b827b2710c1f9ac64fe8879f08e1008a8647966a Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期四, 07 七月 2022 13:42:12 +0800
Subject: [PATCH] 大屏数据调整
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java | 74 ++++++++++++++++++++++++++++---------
1 files changed, 56 insertions(+), 18 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 a11d964..34e08f5 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
@@ -17,6 +17,7 @@
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.community.*;
+import com.panzhihua.service_community.entity.ComActSocialProject;
import org.apache.commons.lang3.time.DateUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.data.redis.core.StringRedisTemplate;
@@ -88,6 +89,10 @@
private ComActActivityCodeService comActActivityCodeService;
@Resource
private ComActDAO comActDAO;
+ @Resource
+ private ComActSocialProjectDao comActSocialProjectDao;
+ @Resource
+ private ComStreetDAO comStreetDAO;
/**
* 新增社区活动
@@ -171,8 +176,24 @@
try {
WxXCXTempSend util = new WxXCXTempSend();
String accessToken = util.getAppAccessToken();
- ComActDO comActDO=comActDAO.selectById(comActActivityDO.getCommunityId());
- R<SysTemplateConfigVO> r=userService.selectTemplate(comActDO.getAreaCode(),1);
+ Integer type = comActActivityDO.getType();
+ String areaCode;
+ if (nonNull(type) && type.equals(4)) {
+ ComActSocialProject comActSocialProject = comActSocialProjectDao.selectById(comActActivityDO.getProjectId());
+ Long streetId = comActSocialProject.getStreetId();
+ Long communityId = comActSocialProject.getCommunityId();
+ if (nonNull(streetId)) {
+ ComStreetDO comStreetDO = comStreetDAO.selectById(streetId);
+ areaCode = comStreetDO.getAreaCode().toString();
+ } else {
+ ComActDO comActDO = comActDAO.selectById(communityId);
+ areaCode = comActDO.getAreaCode();
+ }
+ } else {
+ ComActDO comActDO = comActDAO.selectById(comActActivityDO.getCommunityId());
+ areaCode = comActDO.getAreaCode();
+ }
+ R<SysTemplateConfigVO> r=userService.selectTemplate(areaCode,1);
activitySignVOS.forEach(activitySignVO1 -> {
// 变更社区活动推送订阅消息给用户
WxUtil.sendSubscribeHDBG(activitySignVO1.getOpenid(), accessToken,
@@ -199,6 +220,7 @@
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) {
@@ -227,7 +249,19 @@
}
page.setSize(pageSize);
page.setCurrent(pageNum);
- IPage<ComActActivityVO> iPage = comActActivityDAO.pageActivity(page, comActActivityVO);
+ Integer type = comActActivityVO.getType();
+ IPage<ComActActivityVO> iPage = null;
+ if (nonNull(type) && type.equals(4)) {
+ if (nonNull(comActActivityVO.getCommunityId())) {
+ ComActDO comActDO = comActDAO.selectById(comActActivityVO.getCommunityId());
+ if (nonNull(comActDO)) {
+ comActActivityVO.setStreetId(comActDO.getStreetId());
+ }
+ }
+ iPage = comActActivityDAO.pageProjectActivity(page, comActActivityVO);
+ } else {
+ iPage = comActActivityDAO.pageActivity(page, comActActivityVO);
+ }
// List<ComActActivityVO> records = iPage.getRecords();
// if (!ObjectUtils.isEmpty(records)) {
// records.forEach(comActActivityVO1 -> {
@@ -309,7 +343,7 @@
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.getType()==3){
if(comActActRegistDO.getEndTime()==null){
comActActivityVO.setSignType(2);
}
@@ -473,6 +507,9 @@
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));
@@ -489,7 +526,7 @@
// 查询当前活动下参与居民
Integer residentCount = comActActSignDAO.selectCount(new QueryWrapper<ComActActSignDO>().lambda()
.eq(ComActActSignDO::getActivityId, activityId).eq(ComActActSignDO::getIsVolunteer, 0).eq(ComActActSignDO::getStatus, 1));
- if (activityType.equals(2)) {
+ if (activityType.equals(1)) {
//志愿者活动
boolean userIsVolunteer = loginUserInfoVO.getIsVolunteer() == 1;
// 查询当前活动下参与志愿者
@@ -546,12 +583,14 @@
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);
}
} else {
@@ -577,7 +616,7 @@
AddComActIntegralUserDTO addComActIntegralUserDTO = new AddComActIntegralUserDTO();
addComActIntegralUserDTO.setUserId(userId);
addComActIntegralUserDTO.setIntegralType(8);
- addComActIntegralUserDTO.setActivityType(1);
+ addComActIntegralUserDTO.setActivityType(actActivityDO.getType());
addComActIntegralUserDTO.setIsVolunteer(comActActSignDO.getIsVolunteer());
addComActIntegralUserDTO.setCommunityId(actActivityDO.getCommunityId());
addComActIntegralUserDTO.setServiceId(activityId);
@@ -617,7 +656,7 @@
.filter(activityDO -> activityDO.getStatus().equals(status)).collect(Collectors.toList());
}
}
- if(isNull(type)){
+ if(!isNull(type)){
comActActivityDOS=comActActivityDOS.stream().filter(comActActivityDO -> comActActivityDO.getType().equals(type)).collect(Collectors.toList());
}
if (!comActActivityDOS.isEmpty()) {
@@ -628,13 +667,9 @@
.filter(activitySignVO -> activitySignVO.getActivityId().equals(comActActivityVO.getId()))
.collect(Collectors.toList());
comActActivityVO.setSignCount(collect.size());
+ comActActivityVO.setIsComment(0);
+ comActActivityVO.setIsRegist(0);
ActivitySignVO activitySignVO = collect.get(0);
- Integer isVolunteer = activitySignVO.getIsVolunteer();
- if (isVolunteer.intValue() == 1) {
- comActActivityVO.setType(1);
- } else {
- comActActivityVO.setType(2);
- }
Integer activityStatus = comActActivityVO.getStatus();
if (activityStatus.intValue() == 3) {
comActActivityVO.setStatus(4);
@@ -647,9 +682,9 @@
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);
});
}
@@ -932,7 +967,7 @@
// return R.fail("你已签到，如要再次签到请三十分钟后尝试！");
// }
ComActActRegistDO comActActRegistDO = new ComActActRegistDO();
- if(comActActRegistVO.getType()!=null&&comActActRegistVO.getType()==2){
+ 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){
@@ -941,7 +976,7 @@
if(comActActActRegistDO.getEndTime()!=null){
return R.fail("无法重复签退");
}
- comActActRegistDO.setId(comActActRegistVO.getId());
+ comActActRegistDO.setId(comActActActRegistDO.getId());
comActActRegistDO.setEndTime(new Date());
int result=comActActRegistDAO.updateById(comActActRegistDO);
if (result > 0) {
@@ -975,7 +1010,7 @@
}
comActActRegistDO.setActivityId(activityId);
comActActRegistDO.setStartTime(new Date());
- comActActRegistDO.setType(1);
+ comActActRegistDO.setType(comActActivityDO.getType());
comActActRegistDO.setUserId(userId);
comActActRegistDO.setIsVolunteer(comActActSignDO.getIsVolunteer());
comActActRegistDO.setCreateAt(nowDate);
@@ -984,7 +1019,7 @@
comActActRegistDO.setPosition(comActActRegistVO.getPosition());
comActActRegistDO.setTimes(signAllCount+1);
int result = comActActRegistDAO.insert(comActActRegistDO);
- if (result > 0&&comActActRegistDO.getType()==1) {
+ if (result > 0&&comActActivityDO.getType()!=3) {
if (isHave) {
boolean isVolunteerAct = comActActivityDO.getVolunteerMax() != 0;
AddComActIntegralUserDTO addComActIntegralUserDTO=new AddComActIntegralUserDTO();
@@ -1000,6 +1035,9 @@
return R.ok();
}
}
+ else {
+ return R.ok();
+ }
}
return R.fail("网络错误，请重试");
// else {
--
Gitblit v1.7.1