diff --git a/dating-agency-mall-constant/src/main/java/com/qniao/dam/domian/aggregate/mica/constant/MarriageInformationContactApplyStatusEnum.java b/dating-agency-mall-constant/src/main/java/com/qniao/dam/domian/aggregate/mica/constant/MarriageInformationContactApplyStatusEnum.java index 6b5879f..f1bf359 100644 --- a/dating-agency-mall-constant/src/main/java/com/qniao/dam/domian/aggregate/mica/constant/MarriageInformationContactApplyStatusEnum.java +++ b/dating-agency-mall-constant/src/main/java/com/qniao/dam/domian/aggregate/mica/constant/MarriageInformationContactApplyStatusEnum.java @@ -10,6 +10,8 @@ import lombok.Getter; @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MarriageInformationContactApplyStatusEnum { + INIT(0, "初始化"), + PENDING(1, "申请中"), APPROVED(2, "已同意"), diff --git a/dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/mica/entity/MarriageInformationContactApply.java b/dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/mica/entity/MarriageInformationContactApply.java index 232027b..ee7baeb 100644 --- a/dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/mica/entity/MarriageInformationContactApply.java +++ b/dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/mica/entity/MarriageInformationContactApply.java @@ -29,6 +29,9 @@ public class MarriageInformationContactApply extends Entity wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(UserMarriageInformation::getType, UserMarriageInformationTypeEnum.MATCHMAKER); + wrapper.eq(UserMarriageInformation::getUserId, userId); + wrapper.last("limit 1"); + return userMarriageInformationDao.selectOne(wrapper); + } } 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 8a45e39..b4acf8e 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 @@ -31,7 +31,7 @@ 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 + WHERE damica.is_delete=0 and damica.`status` !=0 and damica.applicant_user_id=#{queryParams.applicantUserId} and damica.`status` = #{queryParams.status} @@ -70,7 +70,7 @@ 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 + WHERE damica.is_delete = 0 and damica.`status` !=0 and damica.target_user_id = #{queryParams.targetUserId} and damica.`status` = #{queryParams.status}