From 7e81ac01060eb047883b8fc8ed24ecc62ed33eae Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 02 八月 2021 15:23:53 +0800
Subject: [PATCH] 修改定时计算积分bug
---
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java | 4 +++-
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java | 5 +++--
2 files changed, 6 insertions(+), 3 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 76c4481..99f60c5 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
@@ -405,13 +405,14 @@
// 修改报名状态 变为报名中
int num1=comActActivityDAO.updateStatusToBeginSign();
log.info("定时任务--修改社区活动报名状态活动数量【{}】",num1);
+ //查询已经结束的活动，需要计算积分
+ List<Long> activityEndIds = comActActivityDAO.getActivityEndIds();
// 修改进行状态 变为进行中或者已结束
int num2=comActActivityDAO.updateStatusToBeginActiveOrEnd();
log.info("定时任务--修改社区活动进行状态活动数量【{}】",num2);
int num3=comActActivityDAO.updateStatusToBeginAfterSingEnd();
log.info("定时任务--报名结束修改社区活动进行状态活动数量【{}】",num3);
- //查询已经结束的活动，需要计算积分
- return R.ok(comActActivityDAO.getActivityEndIds());
+ return R.ok(activityEndIds);
}
/**
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java
index 48376b3..67dffb0 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java
@@ -489,10 +489,12 @@
// 修改报名状态为报名中
int num1=comBpActivityDAO.updateStatusToSign();
log.info("定时任务修改党建活动--修改报名状态为报名中始数量【{}】",num1);
+ //查询已结束的活动id,便于计算用户积分
+ List<Long> pbActivityEndIds = comBpActivityDAO.getTaskPbActivityEndIds();
// 修改进行状态为进行中 或者已结束
int num2=comBpActivityDAO.updateStatusToActiveOrEnd();
log.info("定时任务修改党建活动--修改进行状态为进行中 或者已结束数量【{}】",num2);
- return R.ok(comBpActivityDAO.getTaskPbActivityEndIds());
+ return R.ok(pbActivityEndIds);
}
/**
--
Gitblit v1.7.1