From bf46bac3cda70dc8dc7ed95e0461f1a72fba2eeb Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 01 八月 2022 14:44:43 +0800
Subject: [PATCH] Merge branch 'shuangzheng2' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java | 65 ++++++++++++++++++++++++++------
1 files changed, 53 insertions(+), 12 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 4eba9df..3582951 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,8 @@
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.community.*;
+import com.panzhihua.common.utlis.Snowflake;
+import com.panzhihua.service_community.entity.ComPbCheckUnit;
import org.apache.commons.lang3.time.DateUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.data.redis.core.StringRedisTemplate;
@@ -88,6 +90,12 @@
private ComActActivityCodeService comActActivityCodeService;
@Resource
private ComActDAO comActDAO;
+ @Resource
+ private ComPbCheckUnitDao comPbCheckUnitDao;
+ @Resource
+ private ComActSocialProjectDao comActSocialProjectDao;
+ @Resource
+ private ComStreetDAO comStreetDAO;
/**
* 新增社区活动
@@ -121,6 +129,10 @@
if(comActActivityVO.getType()==4){
comActActivityDO.setIsProject(1);
}
+ if(comActActivityVO.getType()==5){
+ comPbCheckUnitDao.selectOne(new QueryWrapper<ComPbCheckUnit>().lambda().eq(ComPbCheckUnit::getAdminPhone,comActActivityVO.getPhone()).last("limit 1"));
+ }
+
boolean save = this.save(comActActivityDO);
if (!save) {
return R.fail();
@@ -170,7 +182,7 @@
if (!activitySignVOS.isEmpty()) {
try {
WxXCXTempSend util = new WxXCXTempSend();
- String accessToken = util.getAppAccessToken();
+ String accessToken = util.getAccessToken();
ComActDO comActDO=comActDAO.selectById(comActActivityDO.getCommunityId());
R<SysTemplateConfigVO> r=userService.selectTemplate(comActDO.getAreaCode(),1);
activitySignVOS.forEach(activitySignVO1 -> {
@@ -199,6 +211,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 +240,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 +334,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||comActActRegistDO.getType()==5){
if(comActActRegistDO.getEndTime()==null){
comActActivityVO.setSignType(2);
}
@@ -336,10 +361,16 @@
*/
@Override
public R listActivitySign(ActivitySignVO activitySignVO) {
-
+ ComActActivityDO comActActivityDO=comActActivityDAO.selectById(activitySignVO.getActivityId());
+ if(comActActivityDO!=null){
+ if(comActActivityDO.getType()==3||comActActivityDO.getType()==5){
+ IPage<ActivitySignVO> activitySignVOS = comActActSignDAO
+ .listActivitySignParty(new Page(activitySignVO.getPageNum(), activitySignVO.getPageSize()), activitySignVO);
+ return R.ok(activitySignVOS);
+ }
+ }
IPage<ActivitySignVO> activitySignVOS = comActActSignDAO
.listActivitySign(new Page(activitySignVO.getPageNum(), activitySignVO.getPageSize()), activitySignVO);
- // List<ActivitySignVO> activitySignVOS = comActActSignDAO.listActivitySign(activitySignVO);
return R.ok(activitySignVOS);
}
@@ -473,6 +504,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));
@@ -546,12 +580,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 +613,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);
@@ -628,7 +664,8 @@
.filter(activitySignVO -> activitySignVO.getActivityId().equals(comActActivityVO.getId()))
.collect(Collectors.toList());
comActActivityVO.setSignCount(collect.size());
- comActActivityVO.setIsComment(1);
+ comActActivityVO.setIsComment(0);
+ comActActivityVO.setIsRegist(0);
ActivitySignVO activitySignVO = collect.get(0);
Integer activityStatus = comActActivityVO.getStatus();
if (activityStatus.intValue() == 3) {
@@ -642,9 +679,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);
});
}
@@ -846,7 +883,7 @@
if (!actActivityList.isEmpty()) {
WxXCXTempSend util = new WxXCXTempSend();
try {
- String accessToken = util.getAppAccessToken();
+ String accessToken = util.getAccessToken();
actActivityList.forEach(actActivity -> {
ComActDO comActDO=comActDAO.selectById(actActivity.getCommunityId());
R<SysTemplateConfigVO> r=userService.selectTemplate(comActDO.getAreaCode(),9);
@@ -936,7 +973,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) {
@@ -970,7 +1007,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);
@@ -979,7 +1016,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();
@@ -994,6 +1031,9 @@
} else {
return R.ok();
}
+ }
+ else {
+ return R.ok();
}
}
return R.fail("网络错误，请重试");
@@ -1108,6 +1148,7 @@
@Override
public R addActivityType(ComActActivityTypeVO comActActivityTypeVO) {
try {
+ comActActivityTypeVO.setId(Snowflake.getId());
this.baseMapper.addActivityType(comActActivityTypeVO);
} catch (Exception e) {
log.error("添加活动类型错误【{}】", e.getMessage());
--
Gitblit v1.7.1