From 273f8b2d2a471c3483133a67fccf5c0b99d1a8a1 Mon Sep 17 00:00:00 2001 From: Derran Date: Mon, 9 Mar 2026 14:23:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A7=94=E6=89=98=E6=9C=8D=E5=8A=A1=E8=B4=B9?= =?UTF-8?q?=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...mationContactApplyUserQueryController.java | 7 +++++++ .../MarriageInformationContactApplyVo.java | 21 +++++++++++++++++++ ...geInformationContactApplyQueryService.java | 3 +++ ...formationContactApplyQueryServiceImpl.java | 17 +++++++++++++++ 4 files changed, 48 insertions(+) create mode 100644 dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/mica/user/response/MarriageInformationContactApplyVo.java diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/mica/user/MarriageInformationContactApplyUserQueryController.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/mica/user/MarriageInformationContactApplyUserQueryController.java index 05ef086..baf9db9 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/mica/user/MarriageInformationContactApplyUserQueryController.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/mica/user/MarriageInformationContactApplyUserQueryController.java @@ -3,6 +3,7 @@ package com.qniao.dam.api.query.mica.user; import com.qniao.dam.api.query.mica.user.request.UserPageApplicantMarriageInformationContactApplyQueryParams; import com.qniao.dam.api.query.mica.user.request.UserPageTargetMarriageInformationContactApplyQueryParams; import com.qniao.dam.api.query.mica.user.response.MarriageInformationContactApplyAbstractVo; +import com.qniao.dam.api.query.mica.user.response.MarriageInformationContactApplyVo; import com.qniao.dam.api.query.mica.user.response.UserPageApplicantMarriageInformationContactApplyVo; import com.qniao.dam.api.query.mica.user.response.UserPageTargetMarriageInformationContactApplyVo; import com.qniao.dam.query.mica.MarriageInformationContactApplyQueryService; @@ -49,5 +50,11 @@ public class MarriageInformationContactApplyUserQueryController { return marriageInformationContactApplyQueryService.getAbstract(userId); } + @GetMapping("get/marriage-information-contact-apply") + @ApiOperation("用户查询征婚资料联系申请") + public MarriageInformationContactApplyVo userGetMarriageInformationContactApply(@RequestParam("userId") Long userId, + @RequestParam("targetMiId") Long targetMiId) { + return marriageInformationContactApplyQueryService.getApplyVo(userId, targetMiId); + } } diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/mica/user/response/MarriageInformationContactApplyVo.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/mica/user/response/MarriageInformationContactApplyVo.java new file mode 100644 index 0000000..54ed9a4 --- /dev/null +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/mica/user/response/MarriageInformationContactApplyVo.java @@ -0,0 +1,21 @@ +package com.qniao.dam.api.query.mica.user.response; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import com.qniao.dam.domian.aggregate.mica.constant.MarriageInformationContactApplyStatusEnum; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class MarriageInformationContactApplyVo { + + @ApiModelProperty("唯一标识") + @JsonSerialize(using = ToStringSerializer.class) + private Long id; + + @ApiModelProperty("状态") + private MarriageInformationContactApplyStatusEnum status; + + @ApiModelProperty("是否解锁") + private Boolean unlocked; +} diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/mica/MarriageInformationContactApplyQueryService.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/mica/MarriageInformationContactApplyQueryService.java index 6c0c22c..ba3b262 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/mica/MarriageInformationContactApplyQueryService.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/mica/MarriageInformationContactApplyQueryService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.qniao.dam.api.query.mica.user.request.UserPageApplicantMarriageInformationContactApplyQueryParams; import com.qniao.dam.api.query.mica.user.request.UserPageTargetMarriageInformationContactApplyQueryParams; import com.qniao.dam.api.query.mica.user.response.MarriageInformationContactApplyAbstractVo; +import com.qniao.dam.api.query.mica.user.response.MarriageInformationContactApplyVo; import com.qniao.dam.api.query.mica.user.response.UserPageApplicantMarriageInformationContactApplyVo; import com.qniao.dam.api.query.mica.user.response.UserPageTargetMarriageInformationContactApplyVo; import com.qniao.domain.QnPage; @@ -18,4 +19,6 @@ public interface MarriageInformationContactApplyQueryService { IPage pageTarget(UserPageTargetMarriageInformationContactApplyQueryParams queryParams, PageUtil pageUtil); MarriageInformationContactApplyAbstractVo getAbstract(Long userId); + + MarriageInformationContactApplyVo getApplyVo(Long applicantUserId, Long targetMiId); } diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/mica/impl/MarriageInformationContactApplyQueryServiceImpl.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/mica/impl/MarriageInformationContactApplyQueryServiceImpl.java index d960d3d..828ded3 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/mica/impl/MarriageInformationContactApplyQueryServiceImpl.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/mica/impl/MarriageInformationContactApplyQueryServiceImpl.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.qniao.dam.api.query.mica.user.request.UserPageApplicantMarriageInformationContactApplyQueryParams; import com.qniao.dam.api.query.mica.user.request.UserPageTargetMarriageInformationContactApplyQueryParams; import com.qniao.dam.api.query.mica.user.response.MarriageInformationContactApplyAbstractVo; +import com.qniao.dam.api.query.mica.user.response.MarriageInformationContactApplyVo; import com.qniao.dam.api.query.mica.user.response.UserPageApplicantMarriageInformationContactApplyVo; import com.qniao.dam.api.query.mica.user.response.UserPageTargetMarriageInformationContactApplyVo; import com.qniao.dam.domain.aggregate.mica.entity.MarriageInformationContactApply; @@ -13,10 +14,12 @@ import com.qniao.dam.infrastructure.persistent.dao.mica.MarriageInformationConta import com.qniao.dam.infrastructure.utils.AgeCalculatorUtil; import com.qniao.dam.query.mica.MarriageInformationContactApplyQueryService; import com.qniao.framework.utils.PageUtil; +import com.qniao.framework.utils.TypeConvertUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.Arrays; +import java.util.Objects; @Service public class MarriageInformationContactApplyQueryServiceImpl implements MarriageInformationContactApplyQueryService { @@ -70,4 +73,18 @@ public class MarriageInformationContactApplyQueryServiceImpl implements Marriage return vo; } + @Override + public MarriageInformationContactApplyVo getApplyVo(Long applicantUserId, Long targetMiId) { + MarriageInformationContactApplyVo vo = null; + MarriageInformationContactApply apply = marriageInformationContactApplyDao.selectOne(new LambdaQueryWrapper() + .eq(MarriageInformationContactApply::getApplicantUserId, applicantUserId) + .eq(MarriageInformationContactApply::getTargetMiId, targetMiId) + .orderByDesc(MarriageInformationContactApply::getCreateTime) + .last("limit 1")); + if (Objects.nonNull(apply)){ + vo = TypeConvertUtils.convert(apply, MarriageInformationContactApplyVo.class); + } + return vo; + } + } \ No newline at end of file