diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/utc/impl/UserTaskCompleteQueryServiceImpl.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/utc/impl/UserTaskCompleteQueryServiceImpl.java index a991197..b2e41a6 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/utc/impl/UserTaskCompleteQueryServiceImpl.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/utc/impl/UserTaskCompleteQueryServiceImpl.java @@ -10,6 +10,7 @@ import com.qniao.dam.domain.aggregate.utc.entity.UserTaskComplete; import com.qniao.dam.domian.aggregate.tasktemplate.constant.TaskGroupEnum; import com.qniao.dam.domian.aggregate.tasktemplate.constant.TaskStageEnum; import com.qniao.dam.domian.aggregate.tasktemplate.constant.TaskTypeEnum; +import com.qniao.dam.infrastructure.persistent.dao.tasktemplate.TaskTemplateDao; import com.qniao.dam.infrastructure.persistent.dao.utc.UserSubTaskCompleteDao; import com.qniao.dam.infrastructure.persistent.dao.utc.UserTaskCompleteDao; import com.qniao.dam.query.livematchmaker.LiveMatchmakerQueryService; @@ -34,6 +35,8 @@ public class UserTaskCompleteQueryServiceImpl implements UserTaskCompleteQuerySe private TaskTemplateQueryService taskTemplateQueryService; @Resource private LiveMatchmakerQueryService liveMatchmakerQueryService; + @Resource + private TaskTemplateDao taskTemplateDao; @Override public UserGetUserTaskCompleteVo getUserTaskCompleteVo(UserGetUserTaskCompleteQueryParams queryParams) { @@ -44,9 +47,9 @@ public class UserTaskCompleteQueryServiceImpl implements UserTaskCompleteQuerySe TaskTypeEnum taskType = TaskTypeEnum.get(queryParams.getTaskType()); Tuple tuple = taskTemplateQueryService.getTaskDate(taskType); UserTaskComplete userTaskComplete = queryBy(queryParams.getQueryUserId(), tuple.get(0), tuple.get(1)); + TaskStageEnum stageCode = TaskStageEnum.count(liveMatchmaker.getCreateTime().toLocalDate()); if (Objects.isNull(userTaskComplete)) { TaskGroupEnum taskGroup = liveMatchmakerQueryService.getTaskGroup(liveMatchmaker); - TaskStageEnum stageCode = TaskStageEnum.count(liveMatchmaker.getCreateTime().toLocalDate()); TaskTemplate taskTemplate = taskTemplateQueryService.queryBy(taskGroup, taskType, stageCode); if (Objects.nonNull(taskTemplate)) { vo = TypeConvertUtils.convert(taskTemplate, UserGetUserTaskCompleteVo.class); @@ -55,14 +58,17 @@ public class UserTaskCompleteQueryServiceImpl implements UserTaskCompleteQuerySe vo.setTaskEndDate(tuple.get(1)); } } else { - vo = new UserGetUserTaskCompleteVo(); - vo.setTaskTemplateId(userTaskComplete.getTaskTemplateId()); - vo.setTaskStartDate(tuple.get(0)); - vo.setTaskEndDate(tuple.get(1)); - vo.setUserTaskCompleteId(userTaskComplete.getId()); - vo.setCompleteStatus(userTaskComplete.getCompleteStatus()); - vo.setRewardReceiveStatus(userTaskComplete.getRewardReceiveStatus()); - vo.setCompleteTime(userTaskComplete.getCompleteTime()); + TaskTemplate taskTemplate = taskTemplateDao.selectById(userTaskComplete.getTaskTemplateId()); + if (Objects.nonNull(taskTemplate)) { + vo = TypeConvertUtils.convert(taskTemplate, UserGetUserTaskCompleteVo.class); + vo.setTaskTemplateId(taskTemplate.getId()); + vo.setTaskStartDate(tuple.get(0)); + vo.setTaskEndDate(tuple.get(1)); + vo.setUserTaskCompleteId(userTaskComplete.getId()); + vo.setCompleteStatus(userTaskComplete.getCompleteStatus()); + vo.setRewardReceiveStatus(userTaskComplete.getRewardReceiveStatus()); + vo.setCompleteTime(userTaskComplete.getCompleteTime()); + } } if (Objects.nonNull(vo)) { //补充子任务进度