From ac9a9743d185d46ec7dca7577402dfef6a553eed Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期三, 27 四月 2022 11:09:00 +0800
Subject: [PATCH] Merge branch 'huacheng' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java | 9 +++++----
1 files changed, 5 insertions(+), 4 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 154b5d3..aac7347 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
@@ -199,6 +199,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) {
@@ -309,7 +310,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);
}
@@ -634,6 +635,7 @@
.collect(Collectors.toList());
comActActivityVO.setSignCount(collect.size());
comActActivityVO.setIsComment(0);
+ comActActivityVO.setIsRegist(0);
ActivitySignVO activitySignVO = collect.get(0);
Integer activityStatus = comActActivityVO.getStatus();
if (activityStatus.intValue() == 3) {
@@ -647,7 +649,6 @@
log.error("时间转换异常【{}】", e.getMessage());
}
comActActivityVO.setSingDate(createAt);
- comActActivityVO.setTimes(activitySignVO.getTimes());
Integer totalAward = comActActRegistDAO.selectTotalAwardWithRegist(activitySignVO.getActivityId(), userId);
comActActivityVO.setAward(totalAward);
comActActivityVO.setActivitySignVOList(collect);
@@ -976,7 +977,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);
@@ -985,7 +986,7 @@
comActActRegistDO.setPosition(comActActRegistVO.getPosition());
comActActRegistDO.setTimes(signAllCount+1);
int result = comActActRegistDAO.insert(comActActRegistDO);
- if (result > 0&&comActActRegistDO.getType()==1&&comActActivityDO.getType()!=3) {
+ if (result > 0&&comActActivityDO.getType()!=3) {
if (isHave) {
boolean isVolunteerAct = comActActivityDO.getVolunteerMax() != 0;
AddComActIntegralUserDTO addComActIntegralUserDTO=new AddComActIntegralUserDTO();
--
Gitblit v1.7.1