From cdd0d053643c8d4b3885402d3b3b48a61e3b0716 Mon Sep 17 00:00:00 2001 From: 188814092560 Date: Mon, 16 Mar 2026 22:55:06 +0800 Subject: [PATCH] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E8=B4=A6=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UserTaskCompleteUserQueryController.java | 16 +++--- ...UserTaskCompleteByOperatorQueryParams.java | 11 +++++ .../PageUserTaskCompleteByOperatorVo.java | 49 +++++++++++++++++++ .../utc/UserTaskCompleteQueryService.java | 7 +++ .../UserTaskCompleteQueryServiceImpl.java | 10 ++++ 5 files changed, 85 insertions(+), 8 deletions(-) create mode 100644 dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/utc/user/request/PageUserTaskCompleteByOperatorQueryParams.java create mode 100644 dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/utc/user/response/PageUserTaskCompleteByOperatorVo.java diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/utc/user/UserTaskCompleteUserQueryController.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/utc/user/UserTaskCompleteUserQueryController.java index 7faea10..d4e0dd8 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/utc/user/UserTaskCompleteUserQueryController.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/utc/user/UserTaskCompleteUserQueryController.java @@ -1,8 +1,8 @@ package com.qniao.dam.api.query.utc.user; -import com.qniao.dam.api.query.eso.user.request.PageEntrustServiceOrderQueryParams; -import com.qniao.dam.api.query.eso.user.response.UserPageEntrustServiceOrderVo; +import com.qniao.dam.api.query.utc.user.request.PageUserTaskCompleteByOperatorQueryParams; import com.qniao.dam.api.query.utc.user.request.UserGetUserTaskCompleteQueryParams; +import com.qniao.dam.api.query.utc.user.response.PageUserTaskCompleteByOperatorVo; import com.qniao.dam.api.query.utc.user.response.UserGetUserTaskCompleteVo; import com.qniao.dam.query.utc.UserTaskCompleteQueryService; import com.qniao.domain.QnPage; @@ -34,10 +34,10 @@ public class UserTaskCompleteUserQueryController { } -// @GetMapping("page/user-task-complete/by/operator") -// @ApiOperation("运营获取委托服务单列表") -// public QnPage userPageUserTaskCompleteByOperator(PageUtil pageUtil, -// PageEntrustServiceOrderQueryParams queryParams) { -// return PageUtil.convert(entrustServiceOrderQueryService.pageOrder(pageUtil, queryParams), UserPageEntrustServiceOrderVo.class); -// } + @GetMapping("page/user-task-complete/by/operator") + @ApiOperation("运营获取委托服务单列表") + public QnPage userPageUserTaskCompleteByOperator(PageUtil pageUtil, + PageUserTaskCompleteByOperatorQueryParams queryParams) { + return PageUtil.convert(userTaskCompleteQueryService.pageByOperator(pageUtil, queryParams), PageUserTaskCompleteByOperatorVo.class); + } } diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/utc/user/request/PageUserTaskCompleteByOperatorQueryParams.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/utc/user/request/PageUserTaskCompleteByOperatorQueryParams.java new file mode 100644 index 0000000..526a3f7 --- /dev/null +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/utc/user/request/PageUserTaskCompleteByOperatorQueryParams.java @@ -0,0 +1,11 @@ +package com.qniao.dam.api.query.utc.user.request; + +import lombok.Data; + +/** + * @author Zpj + * @date 2026/3/16 + */ +@Data +public class PageUserTaskCompleteByOperatorQueryParams { +} diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/utc/user/response/PageUserTaskCompleteByOperatorVo.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/utc/user/response/PageUserTaskCompleteByOperatorVo.java new file mode 100644 index 0000000..55f8dc2 --- /dev/null +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/utc/user/response/PageUserTaskCompleteByOperatorVo.java @@ -0,0 +1,49 @@ +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.TaskTypeEnum; +import com.qniao.dau.domian.aggregate.lmar.constant.LiveMatchmakerTypeEnum; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.time.LocalDate; +import java.util.List; + +/** + * @author Zpj + * @date 2026/3/16 + */ +@Data +public class PageUserTaskCompleteByOperatorVo { + + @ApiModelProperty("用户id") + @JsonSerialize(using = ToStringSerializer.class) + private Long userId; + + @ApiModelProperty("昵称") + private String nickName; + + @ApiModelProperty("昵称") + private String phone; + + @ApiModelProperty("任务类型（1-每日任务，2-每周任务，3-每月任务）") + private TaskTypeEnum taskType; + + @ApiModelProperty("红娘类型") + private LiveMatchmakerTypeEnum liveMatchmakerType; + + @ApiModelProperty("任务开始日期") + @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate taskStartDate; + + @ApiModelProperty("任务结束日期") + @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate taskEndDate; + + @ApiModelProperty("完成状态") + private Boolean completeStatus; + + private List itemList; +} diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/utc/UserTaskCompleteQueryService.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/utc/UserTaskCompleteQueryService.java index 61455ac..6ef6e08 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/utc/UserTaskCompleteQueryService.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/utc/UserTaskCompleteQueryService.java @@ -1,10 +1,15 @@ package com.qniao.dam.query.utc; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.qniao.dam.api.query.utc.user.request.PageUserTaskCompleteByOperatorQueryParams; import com.qniao.dam.api.query.utc.user.request.UserGetUserTaskCompleteQueryParams; +import com.qniao.dam.api.query.utc.user.response.PageUserTaskCompleteByOperatorVo; import com.qniao.dam.api.query.utc.user.response.UserGetUserTaskCompleteVo; import com.qniao.dam.domain.aggregate.utc.entity.UserSubTaskComplete; import com.qniao.dam.domain.aggregate.utc.entity.UserTaskComplete; import com.qniao.dam.domian.aggregate.tasktemplate.constant.TaskTypeEnum; +import com.qniao.domain.QnPage; +import com.qniao.framework.utils.PageUtil; import java.time.LocalDate; @@ -18,4 +23,6 @@ public interface UserTaskCompleteQueryService { LocalDate taskEndDate); UserSubTaskComplete querySubBy(Long userTaskCompleteId, Long subTaskTemplateId); + + IPage pageByOperator(PageUtil pageUtil, PageUserTaskCompleteByOperatorQueryParams queryParams); } 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 e9cab26..d3ea847 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 @@ -3,7 +3,10 @@ package com.qniao.dam.query.utc.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.Tuple; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.qniao.dam.api.query.utc.user.request.PageUserTaskCompleteByOperatorQueryParams; import com.qniao.dam.api.query.utc.user.request.UserGetUserTaskCompleteQueryParams; +import com.qniao.dam.api.query.utc.user.response.PageUserTaskCompleteByOperatorVo; 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.tasktemplate.entity.SubTaskTemplate; @@ -20,6 +23,7 @@ import com.qniao.dam.query.tasktemplate.TaskTemplateQueryService; import com.qniao.dam.query.udtp.UserDailyTaskProgressQueryService; import com.qniao.dam.query.utc.UserTaskCompleteQueryService; import com.qniao.dau.domain.aggregate.livematchmaker.entity.LiveMatchmaker; +import com.qniao.framework.utils.PageUtil; import com.qniao.framework.utils.TypeConvertUtils; import org.springframework.stereotype.Service; @@ -111,4 +115,10 @@ public class UserTaskCompleteQueryServiceImpl implements UserTaskCompleteQuerySe .eq(UserSubTaskComplete::getSubTaskTemplateId, subTaskTemplateId) .last("LIMIT 1")); } + + @Override + public IPage pageByOperator(PageUtil pageUtil, + PageUserTaskCompleteByOperatorQueryParams queryParams) { + return null; + } } \ No newline at end of file