|
@@ -71,7 +71,8 @@ public class TaskServiceImpl implements TaskService {
|
|
|
.eq(TaskUserCompleteRecord::getUserId, userId)
|
|
.eq(TaskUserCompleteRecord::getUserId, userId)
|
|
|
.last("limit 1");
|
|
.last("limit 1");
|
|
|
List<Task> tasks = taskMapper.selectList(Wrappers.lambdaQuery(Task.class)
|
|
List<Task> tasks = taskMapper.selectList(Wrappers.lambdaQuery(Task.class)
|
|
|
- .eq(Task::getTypeId, type.getId()));
|
|
|
|
|
|
|
+ .eq(Task::getTypeId, type.getId())
|
|
|
|
|
+ .eq(Task::getDeleted, true));
|
|
|
tasks.forEach(task -> {
|
|
tasks.forEach(task -> {
|
|
|
if ("time".equals(task.getTaskLimit())) {
|
|
if ("time".equals(task.getTaskLimit())) {
|
|
|
TaskUserCompleteRecord record = taskUserCompleteRecordMapper.selectOne(Wrappers.lambdaQuery(TaskUserCompleteRecord.class)
|
|
TaskUserCompleteRecord record = taskUserCompleteRecordMapper.selectOne(Wrappers.lambdaQuery(TaskUserCompleteRecord.class)
|
|
@@ -125,13 +126,13 @@ public class TaskServiceImpl implements TaskService {
|
|
|
|
|
|
|
|
public void handleSpecialTask(TaskType type, Task task, Long userId, LambdaQueryWrapper<TaskUserCompleteRecord> wrapper, DateTime beginTime, DateTime endTime) {
|
|
public void handleSpecialTask(TaskType type, Task task, Long userId, LambdaQueryWrapper<TaskUserCompleteRecord> wrapper, DateTime beginTime, DateTime endTime) {
|
|
|
wrapper.eq(TaskUserCompleteRecord::getTaskId, task.getId());
|
|
wrapper.eq(TaskUserCompleteRecord::getTaskId, task.getId());
|
|
|
- if (!TaskTypeEnum.share.name().equals(type.getName())) {
|
|
|
|
|
|
|
+ if (!TaskTypeEnum.share.getDesc().equals(type.getName())) {
|
|
|
wrapper.between(TaskUserCompleteRecord::getCreatedTime, beginTime, endTime);
|
|
wrapper.between(TaskUserCompleteRecord::getCreatedTime, beginTime, endTime);
|
|
|
TaskUserCompleteRecord record = taskUserCompleteRecordMapper.selectOne(wrapper);
|
|
TaskUserCompleteRecord record = taskUserCompleteRecordMapper.selectOne(wrapper);
|
|
|
if (record == null) {
|
|
if (record == null) {
|
|
|
saveCompleteTask(task.getId(), userId,task.getPoints());
|
|
saveCompleteTask(task.getId(), userId,task.getPoints());
|
|
|
}
|
|
}
|
|
|
- } else if (TaskTypeEnum.share.name().equals(type.getName())) {
|
|
|
|
|
|
|
+ } else if (TaskTypeEnum.share.getDesc().equals(type.getName())) {
|
|
|
//邀请人数是否达标
|
|
//邀请人数是否达标
|
|
|
Integer count = userDistributeSharedMapper.selectCount(Wrappers.lambdaQuery(UserDistributeShared.class)
|
|
Integer count = userDistributeSharedMapper.selectCount(Wrappers.lambdaQuery(UserDistributeShared.class)
|
|
|
.eq(UserDistributeShared::getSharedId, userId)
|
|
.eq(UserDistributeShared::getSharedId, userId)
|