From b3ae6a2e0e1fc7271e905a555e42944a85710715 Mon Sep 17 00:00:00 2001 From: Derran Date: Fri, 6 Feb 2026 14:00:54 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BD=BF=E7=94=A8=E8=81=94?= =?UTF-8?q?=E7=B3=BB=E5=8D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...serPageApplicantMarriageInformationContactApplyVo.java | 3 +++ .../UserPageTargetMarriageInformationContactApplyVo.java | 3 +++ .../mapper/mica/MarriageInformationContactApplyDao.xml | 8 ++++++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/mica/user/response/UserPageApplicantMarriageInformationContactApplyVo.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/mica/user/response/UserPageApplicantMarriageInformationContactApplyVo.java index f90cff3..f132bfd 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/mica/user/response/UserPageApplicantMarriageInformationContactApplyVo.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/mica/user/response/UserPageApplicantMarriageInformationContactApplyVo.java @@ -60,6 +60,9 @@ public class UserPageApplicantMarriageInformationContactApplyVo { @ApiModelProperty("是否解锁") private Boolean unlocked; + @ApiModelProperty("电话") + private String phone; + @ApiModelProperty("创建时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/mica/user/response/UserPageTargetMarriageInformationContactApplyVo.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/mica/user/response/UserPageTargetMarriageInformationContactApplyVo.java index c830eb1..05bd569 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/mica/user/response/UserPageTargetMarriageInformationContactApplyVo.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/mica/user/response/UserPageTargetMarriageInformationContactApplyVo.java @@ -54,6 +54,9 @@ public class UserPageTargetMarriageInformationContactApplyVo { @ApiModelProperty("市名称") private String cityName; + @ApiModelProperty("电话") + private String phone; + @ApiModelProperty("状态") private MarriageInformationContactApplyStatusEnum status; diff --git a/dating-agency-mall-server/src/main/resources/mapper/mica/MarriageInformationContactApplyDao.xml b/dating-agency-mall-server/src/main/resources/mapper/mica/MarriageInformationContactApplyDao.xml index 4160d15..47fb96d 100644 --- a/dating-agency-mall-server/src/main/resources/mapper/mica/MarriageInformationContactApplyDao.xml +++ b/dating-agency-mall-server/src/main/resources/mapper/mica/MarriageInformationContactApplyDao.xml @@ -19,9 +19,11 @@ dami.city_name, damica.`status`, damica.unlocked, - damica.create_time + damica.create_time, + daa.tid as phone from da_marriage_information_contact_apply as damica LEFT JOIN da_marriage_information as dami on damica.target_mi_id=dami.id + LEFT JOIN da_account as daa on daa.is_delete=0 and daa.type=2 and daa.user_id=damica.target_user_id WHERE damica.is_delete=0 and damica.applicant_user_id=#{queryParams.applicantUserId} ORDER BY damica.`status` ASC,damica.create_time desc @@ -43,9 +45,11 @@ dami.city_name, damica.`status`, damica.unlocked, - damica.create_time + damica.create_time, + daa.tid as phone from da_marriage_information_contact_apply as damica LEFT JOIN da_marriage_information as dami on damica.applicant_mi_id = dami.id + LEFT JOIN da_account as daa on daa.is_delete=0 and daa.user_id=damica.applicant_user_id and daa.type=2 WHERE damica.is_delete = 0 and damica.target_user_id = #{queryParams.targetUserId} ORDER BY damica.`status` ASC, damica.create_time desc