From 40ff51856a11151ab3f0154a1ae3530e00dafff7 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期四, 23 十二月 2021 13:52:31 +0800
Subject: [PATCH] 修改活动bug
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java | 70 +++++++++++++++++++++++------------
1 files changed, 46 insertions(+), 24 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 25ab5a4..dd45bcc 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
@@ -285,8 +285,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);
@@ -484,13 +483,13 @@
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::getActivityId, activityId).eq(ComActActSignDO::getIsVolunteer, 0).eq(ComActActSignDO::getStatus, 1));
if (volunteerMax != 0) {
//志愿者活动
boolean userIsVolunteer = loginUserInfoVO.getIsVolunteer() == 1;
// 查询当前活动下参与志愿者
Integer volunteerCount = comActActSignDAO.selectCount(new QueryWrapper<ComActActSignDO>().lambda()
- .eq(ComActActSignDO::getActivityId, activityId).eq(ComActActSignDO::getIsVolunteer, 1));
+ .eq(ComActActSignDO::getActivityId, activityId).eq(ComActActSignDO::getIsVolunteer, 1).eq(ComActActSignDO::getStatus, 1));
if (userIsVolunteer) {
//用户是志愿者以志愿者身份参加
if (volunteerMax > volunteerCount || volunteerMax.equals(-1)) {
@@ -551,9 +550,14 @@
num = comActActSignDAO.insert(comActActSignDO);
}
} else {
+ 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("缺少取消原因");
@@ -567,8 +571,9 @@
if (num > 0) {
AddComActIntegralUserDTO addComActIntegralUserDTO = new AddComActIntegralUserDTO();
addComActIntegralUserDTO.setUserId(userId);
- addComActIntegralUserDTO.setIntegralType(9);
+ addComActIntegralUserDTO.setIntegralType(8);
addComActIntegralUserDTO.setActivityType(1);
+ addComActIntegralUserDTO.setIsVolunteer(comActActSignDO.getIsVolunteer());
addComActIntegralUserDTO.setCommunityId(actActivityDO.getCommunityId());
addComActIntegralUserDTO.setServiceId(activityId);
comActIntegralUserTradeService.addIntegralTradeAdmin(addComActIntegralUserDTO);
@@ -599,8 +604,13 @@
List<ComActActivityDO> comActActivityDOS = comActActivityDAO.selectBatchIds(longs);
List<ComActActivityVO> comActActivityVOS = new ArrayList<>();
if (nonNull(status)) {
- comActActivityDOS = comActActivityDOS.stream()
- .filter(activityDO -> activityDO.getStatus().equals(status)).collect(Collectors.toList());
+ 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());
+ }
}
if (!comActActivityDOS.isEmpty()) {
comActActivityDOS.forEach(comActActivityDO -> {
@@ -891,6 +901,12 @@
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();
@@ -905,39 +921,45 @@
if (signDayCount > 0) {
return R.fail("请扫描新的签到码");
}
- int limit = comActActivityDO.getLimit().intValue();
- if(limit != -1 && signAllCount >= limit){
- return R.fail("签到次数上限");
+ Integer haveIntegralReward = comActActivityDO.getHaveIntegralReward();
+ boolean isHave = nonNull(haveIntegralReward) && haveIntegralReward.equals(1);
+ if (isHave) {
+ int limit = comActActivityDO.getLimit().intValue();
+ if(limit != -1 && signAllCount >= limit){
+ return R.fail("签到次数上限");
+ }
}
// String activitySignInKey = String.join(DELIMITER, ACTIVITY_SIGN_IN, userId.toString(), activityId.toString());
// if (stringRedisTemplate.hasKey(activitySignInKey)) {
// return R.fail("你已签到，如要再次签到请三十分钟后尝试！");
// }
- Integer haveIntegralReward = comActActivityDO.getHaveIntegralReward();
- boolean isHave = nonNull(haveIntegralReward) && haveIntegralReward.equals(1);
ComActActRegistDO comActActRegistDO = new ComActActRegistDO();
comActActRegistDO.setActivityId(activityId);
comActActRegistDO.setType(1);
comActActRegistDO.setUserId(userId);
- comActActRegistDO.setIsVolunteer(comActActRegistVO.getIsVolunteer());
+ 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 (isHave && result > 0) {
- AddComActIntegralUserDTO addComActIntegralUserDTO=new AddComActIntegralUserDTO();
- addComActIntegralUserDTO.setUserId(userId);
- addComActIntegralUserDTO.setIntegralType(8);
- addComActIntegralUserDTO.setActivityType(1);
- addComActIntegralUserDTO.setCommunityId(comActActivityDO.getCommunityId());
- addComActIntegralUserDTO.setServiceId(activityId);
- comActIntegralUserTradeService.addIntegralTradeAdmin(addComActIntegralUserDTO);
-// ValueOperations<String, String> opsForValue = stringRedisTemplate.opsForValue();
-// opsForValue.set(activitySignInKey, "", 1800L, TimeUnit.SECONDS);
- return R.ok(comActActivityDO.getRewardIntegral());
+ if (result > 0) {
+ 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();
+ }
}
return R.fail("网络错误，请重试");
}
--
Gitblit v1.7.1