From 70d2a5d0f9c6951b2d4cac954041ed73582ff7eb Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 09 六月 2025 11:54:00 +0800
Subject: [PATCH] 6.9新增登录失败冻结逻辑
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java | 36 ++++++++++++++----------------------
1 files changed, 14 insertions(+), 22 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 82bd172..0db992d 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
@@ -183,7 +183,9 @@
comActActivityDO.setIsProject(1);
}
if(comActActivityVO.getType()==5){
- comPbCheckUnitDao.selectOne(new QueryWrapper<ComPbCheckUnit>().lambda().eq(ComPbCheckUnit::getAdminPhone,comActActivityVO.getPhone()).last("limit 1"));
+ //TODO 查询然后呢? 值都没给...
+ comPbCheckUnitDao.selectOne(new QueryWrapper<ComPbCheckUnit>().lambda()
+ .eq(ComPbCheckUnit::getAdminPhone,comActActivityVO.getPhone()).last("limit 1"));
}
boolean save = this.save(comActActivityDO);
@@ -747,7 +749,7 @@
if(!isNull(type)){
comActActivityDOS=comActActivityDOS.stream().filter(comActActivityDO -> comActActivityDO.getType().equals(type)).collect(Collectors.toList());
}
- if (!comActActivityDOS.isEmpty()) {
+ if (comActActivityDOS != null ) {
comActActivityDOS.forEach(comActActivityDO -> {
ComActActivityVO comActActivityVO = new ComActActivityVO();
BeanUtils.copyProperties(comActActivityDO, comActActivityVO);
@@ -759,7 +761,7 @@
comActActivityVO.setIsRegist(0);
ActivitySignVO activitySignVO = collect.get(0);
Integer activityStatus = comActActivityVO.getStatus();
- if (activityStatus.intValue() == 3) {
+ if (activityStatus !=null && activityStatus == 3) {
comActActivityVO.setStatus(4);
}
Date createAt = null;
@@ -842,7 +844,7 @@
// 修改报名状态 变为报名中
// int num1 = comActActivityDAO.updateStatusToBeginSign();
// log.info("定时任务--修改社区活动报名状态活动数量【{}】", num1);
- // 查询已经结束的活动，需要计算积分
+ //报名结束 通知参与用户
List<Long> activityEndIds = comActActivityDAO.selectBeginIds();
WxMaService maService = wxMaConfiguration.getMaService("wx118de8a734d269f0");
if(!CollectionUtils.isEmpty(activityEndIds)){
@@ -860,6 +862,7 @@
}
});
}
+ //报名时间结束 活动变更 进行中
int num3 = comActActivityDAO.updateStatusToBeginAfterSingEnd();
log.info("定时任务--报名结束修改社区活动进行状态活动数量【{}】", num3);
// 修改进行状态 变为进行中或者已结束
@@ -867,6 +870,7 @@
if(!CollectionUtils.isEmpty(ids)){
int num2 = comActActivityDAO.updateStatusToBeginActiveOrEnd();
log.info("定时任务--修改社区活动进行状态活动数量【{}】", num2);
+ //通知用户 活动结束
ids.forEach(id ->{
List<String> openIds=comActActivityDAO.selectOpenIdByActivityId(id);
if(!CollectionUtils.isEmpty(openIds)){
@@ -908,12 +912,12 @@
page.setCurrent(pageNum);
Long communityId = comActActivityVO.getCommunityId();
if (null != communityId){
- List<Long> communityIds = comActDAO.selectIds(communityId);
- if (CollUtil.isEmpty(communityIds)) {
- communityIds = new ArrayList<>();
- communityIds.add(communityId);
- }
- comActActivityVO.setCommunityIds(communityIds);
+// List<Long> communityIds = comActDAO.selectIds(communityId);
+// if (CollUtil.isEmpty(communityIds)) {
+// communityIds = new ArrayList<>();
+// communityIds.add(communityId);
+// }
+ comActActivityVO.setCommunityIds(Arrays.asList( comActActivityVO.getCommunityId() ));
}
IPage<ComActActivityVO> iPage = comActActivityDAO.pageActivityCommunityBack(page, comActActivityVO);
iPage.getRecords().forEach(vo ->{
@@ -1526,10 +1530,6 @@
switch (comActActActRegistDO.getSignIdentity())
{
case 1:
- if(comActActivityDO.getParticipantRewardWay()==1)
- {
- rewardIntegral=rewardIntegral*(comActActActRegistDO.getTimes());
- }
if(comActActivityDO.getParticipantRewardWay()==2)
{
int hours = com.panzhihua.common.utlis.DateUtils.getHour(comActActActRegistDO.getStartTime(), comActActActRegistDO.getEndTime());
@@ -1541,10 +1541,6 @@
break;
case 2:
- if(comActActivityDO.getPbRewardWay()==1)
- {
- rewardIntegral=rewardIntegral*(comActActActRegistDO.getTimes());
- }
if(comActActivityDO.getPbRewardWay()==2)
{
int hours = com.panzhihua.common.utlis.DateUtils.getHour(comActActActRegistDO.getStartTime(), comActActActRegistDO.getEndTime());
@@ -1556,10 +1552,6 @@
break;
case 3:
- if(comActActivityDO.getVolunteerRewardWay()==1)
- {
- rewardIntegral=rewardIntegral*(comActActActRegistDO.getTimes());
- }
if(comActActivityDO.getVolunteerRewardWay()==2)
{
int hours = com.panzhihua.common.utlis.DateUtils.getHour(comActActActRegistDO.getStartTime(), comActActActRegistDO.getEndTime());
--
Gitblit v1.7.1