Parcourir la source

fix 邀请好友

zoujiajian il y a 3 ans
Parent
commit
6a5a327e3e

+ 4 - 3
netflix-service/src/main/java/com/cyksj/service/market/task/impl/TaskServiceImpl.java

@@ -71,7 +71,8 @@ public class TaskServiceImpl implements TaskService {
 				.eq(TaskUserCompleteRecord::getUserId, userId)
 				.last("limit 1");
 		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 -> {
 			if ("time".equals(task.getTaskLimit())) {
 				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) {
 		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);
 			TaskUserCompleteRecord record = taskUserCompleteRecordMapper.selectOne(wrapper);
 			if (record == null) {
 				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)
 					.eq(UserDistributeShared::getSharedId, userId)