|
|
@ -193,16 +193,17 @@ public class TaskPointService {
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
taskPoint.setUserStatus(PointEnums.NOT_PARTICIPATED.getCode());
|
|
|
|
taskPoint.setUserStatus(PointEnums.NOT_PARTICIPATED.getCode());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
if (Objects.equals(taskPoint.getType(), Integer.valueOf(TaskPointIdConstants.DAILY_SIGN))) {
|
|
|
|
if (!Objects.equals(taskPoint.getId(), TaskPointIdConstants.NEW_USER_INVITE)) {
|
|
|
|
// 校验今日是否已签到
|
|
|
|
// 校验今日是否已签到
|
|
|
|
UserPointLog todayByUserIdAndTaskPointId = userPointLogDao.findTodayByUserIdAndTaskPointId(userLoginDto.getUserId(), TaskPointIdConstants.DAILY_SIGN);
|
|
|
|
UserPointLog todayByUserIdAndTaskPointId = userPointLogDao.findTodayByUserIdAndTaskPointId(userLoginDto.getUserId(), taskPoint.getId());
|
|
|
|
if(todayByUserIdAndTaskPointId != null) {
|
|
|
|
if(todayByUserIdAndTaskPointId != null) {
|
|
|
|
taskPoint.setUserStatus(PointEnums.PARTICIPATED.getCode());
|
|
|
|
taskPoint.setUserStatus(PointEnums.PARTICIPATED.getCode());
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
taskPoint.setUserStatus(PointEnums.NOT_PARTICIPATED.getCode());
|
|
|
|
taskPoint.setUserStatus(PointEnums.NOT_PARTICIPATED.getCode());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
});
|
|
|
|
});
|
|
|
|
return result;
|
|
|
|
return result;
|
|
|
|