直播红娘任务

dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/utc/user/response/UserGetUserTaskCompleteVo.java

@@ -1,6 +1,8 @@
 package com.qniao.dam.api.query.utc.user.response;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 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;
@@ -15,6 +17,10 @@ import java.util.List;
 @Data
 public class UserGetUserTaskCompleteVo {
 
+    @ApiModelProperty("用户任务进度标识")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long userTaskCompleteId;
+
     @ApiModelProperty("任务群体")
     private TaskGroupEnum taskGroup;
 

dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/persistent/dao/utc/UserTaskCompleteDao.java

@@ -2,10 +2,13 @@ package com.qniao.dam.infrastructure.persistent.dao.utc;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.qniao.dam.api.query.utc.user.request.UserGetUserTaskCompleteQueryParams;
+import com.qniao.dam.api.query.utc.user.response.UserGetUserSubTaskCompleteVo;
 import com.qniao.dam.api.query.utc.user.response.UserGetUserTaskCompleteVo;
 import com.qniao.dam.domain.aggregate.utc.entity.UserTaskComplete;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * 用户任务完成表
  *
@@ -13,6 +16,7 @@ import org.apache.ibatis.annotations.Param;
  */
 public interface UserTaskCompleteDao extends BaseMapper<UserTaskComplete> {
 
-    UserGetUserTaskCompleteVo getUserTaskComplete(@Param("queryParams") UserGetUserTaskCompleteQueryParams queryParams);
+    List<UserGetUserSubTaskCompleteVo> listSubVo(@Param("taskTemplateId") Long taskTemplateId,
+                                                 @Param("userTaskCompleteId") Long userTaskCompleteId);
 
 }

dating-agency-mall-server/src/main/java/com/qniao/dam/query/utc/impl/UserTaskCompleteQueryServiceImpl.java

@@ -48,10 +48,13 @@ public class UserTaskCompleteQueryServiceImpl implements UserTaskCompleteQuerySe
                 vo.setTaskEndDate(tuple.get(1));
                 UserTaskComplete userTaskComplete = queryBy(queryParams.getQueryUserId(), taskTemplate.getId(), tuple.get(0), tuple.get(1));
                 if (Objects.nonNull(userTaskComplete)) {
+                    vo.setUserTaskCompleteId(userTaskComplete.getId());
                     vo.setCompleteStatus(userTaskComplete.getCompleteStatus());
                     vo.setRewardReceiveStatus(userTaskComplete.getRewardReceiveStatus());
                     vo.setCompleteTime(userTaskComplete.getCompleteTime());
                 }
+                //补充子任务进度
+                vo.setSubList(userTaskCompleteDao.listSubVo(taskTemplate.getId(), vo.getUserTaskCompleteId()));
             }
         }
         return vo;

dating-agency-mall-server/src/main/resources/mapper/utc/UserTaskCompleteDao.xml

@@ -2,19 +2,22 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.qniao.dam.infrastructure.persistent.dao.utc.UserTaskCompleteDao">
 
-    <select id="getUserTaskComplete" resultType="com.qniao.dam.api.query.utc.user.response.UserGetUserTaskCompleteVo">
-        SELECT datt.task_group,
-               datt.task_type,
-               datt.stage_code,
-               datt.task_name,
-               datt.task_desc,
-               datt.reward_value,
-               IFNULL(dautc.complete_status, 0) as completeStatus
-        from da_task_template as datt
-        WHERE datt.task_group = #{queryParams.taskGroup}
-          and dautc.user_id = #{queryParams.queryUserId}
-          and datt.task_type = #{queryParams.taskType}
-              limit 1
+    <select id="listSubVo" resultType="com.qniao.dam.api.query.utc.user.response.UserGetUserSubTaskCompleteVo">
+        SELECT dastt.sub_task_name,
+               dastt.sub_task_type,
+               dastt.sub_task_desc,
+               dastt.required_count,
+               daustc.complete_count,
+               daustc.complete_status,
+               daustc.complete_time,
+               dastt.sort
+        from da_sub_task_template as dastt
+                 LEFT JOIN da_user_sub_task_complete as daustc
+                           on daustc.is_delete = 0 and dastt.id = daustc.sub_task_template_id and
+                              daustc.user_task_complete_id = #{userTaskCompleteId}
+        where dastt.is_delete = 0
+          and dastt.task_template_id = #{taskTemplateId}
+        ORDER BY dastt.sort ASC
     </select>
 
 </mapper>