From a6b211f0498d2aa7a7a4712ce4b39e11021e096e Mon Sep 17 00:00:00 2001 From: Derran Date: Fri, 20 Mar 2026 17:58:16 +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 --- .../response/MarriageInformationVo.java | 3 +++ .../ccur/ContactCardUsageRecordApplicationService.java | 2 +- .../service/order/OrderApplicationService.java | 2 +- .../qniao/dam/query/account/AccountQueryService.java | 2 ++ .../query/account/impl/AccountQueryServiceImpl.java | 7 +++++++ .../eso/impl/EntrustServiceOrderQueryServiceImpl.java | 10 +++++----- .../MarriageInformationQueryService.java | 2 +- .../impl/MarriageInformationQueryServiceImpl.java | 8 ++++++-- .../UserMarriageInformationQueryService.java | 2 +- .../impl/UserMarriageInformationQueryServiceImpl.java | 3 +-- 10 files changed, 28 insertions(+), 13 deletions(-) diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/marriageinformation/response/MarriageInformationVo.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/marriageinformation/response/MarriageInformationVo.java index debd693..ba117dc 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/marriageinformation/response/MarriageInformationVo.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/marriageinformation/response/MarriageInformationVo.java @@ -16,6 +16,9 @@ public class MarriageInformationVo { @ApiModelProperty("昵称") private String nickName; + @ApiModelProperty("号码") + private String phone; + @ApiModelProperty("头像URL") private String profilePhoto; diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/ccur/ContactCardUsageRecordApplicationService.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/ccur/ContactCardUsageRecordApplicationService.java index ebdb9f4..3188426 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/ccur/ContactCardUsageRecordApplicationService.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/ccur/ContactCardUsageRecordApplicationService.java @@ -81,7 +81,7 @@ public class ContactCardUsageRecordApplicationService { apply.setApplicantUserId(usageRecord.getUserId()); apply.setApplicantMiId(applicantMarriageInformation.getId()); apply.setTargetMiId(usageRecord.getTargetMiId()); - UserMarriageInformation targetUserMarriageInformation = userMarriageInformationQueryService.queryOwnByMiId(usageRecord.getTargetMiId()); + UserMarriageInformation targetUserMarriageInformation = userMarriageInformationQueryService.queryByMiId(usageRecord.getTargetMiId()); if (Objects.isNull(targetUserMarriageInformation)) { throw new BizException("申请异常"); } diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/order/OrderApplicationService.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/order/OrderApplicationService.java index 67657fd..64f18a6 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/order/OrderApplicationService.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/order/OrderApplicationService.java @@ -315,7 +315,7 @@ public class OrderApplicationService extends BaseApplicationService { private void handleEntrustServiceOrder(EntrustServiceOrder entrustServiceOrder, UserMarriageInformation initiatorUserMarriageInformation) { entrustServiceOrder.setInitiatorMiId(initiatorUserMarriageInformation.getMiId()); - UserMarriageInformation targetUserMarriageInformation = userMarriageInformationQueryService.queryOwnByMiId(entrustServiceOrder.getTargetMiId()); + UserMarriageInformation targetUserMarriageInformation = userMarriageInformationQueryService.queryByMiId(entrustServiceOrder.getTargetMiId()); if (Objects.isNull(targetUserMarriageInformation)) { throw new BizException("无法发起牵线"); } diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/account/AccountQueryService.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/account/AccountQueryService.java index 8cfd1dc..6512c83 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/account/AccountQueryService.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/account/AccountQueryService.java @@ -6,4 +6,6 @@ import com.qniao.dau.domian.aggregate.account.constant.AccountTypeEnum; public interface AccountQueryService { Account queryByUserIdAndType(Long userId, AccountTypeEnum type); + + String queryPhone(Long userId); } diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/account/impl/AccountQueryServiceImpl.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/account/impl/AccountQueryServiceImpl.java index d507d8b..7697e46 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/account/impl/AccountQueryServiceImpl.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/account/impl/AccountQueryServiceImpl.java @@ -8,6 +8,7 @@ import com.qniao.dau.domian.aggregate.account.constant.AccountTypeEnum; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.Objects; @Service public class AccountQueryServiceImpl implements AccountQueryService { @@ -22,4 +23,10 @@ public class AccountQueryServiceImpl implements AccountQueryService { .eq(Account::getType, type) .last("limit 1")); } + + @Override + public String queryPhone(Long userId) { + Account account = queryByUserIdAndType(userId, AccountTypeEnum.MOBILE); + return Objects.nonNull(account) ? account.getTid() : null; + } } diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/eso/impl/EntrustServiceOrderQueryServiceImpl.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/eso/impl/EntrustServiceOrderQueryServiceImpl.java index 2b34f1a..e8609b0 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/eso/impl/EntrustServiceOrderQueryServiceImpl.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/eso/impl/EntrustServiceOrderQueryServiceImpl.java @@ -54,7 +54,7 @@ public class EntrustServiceOrderQueryServiceImpl implements EntrustServiceOrderQ IPage page = entrustServiceOrderDao.pageOrderByInitiator(pageUtil.toPageWithoutOrders(), queryParams); if (page.getSize() > 0) { page.getRecords().forEach(record -> { - record.setTargetMiInfo(marriageInformationQueryService.queryVo(record.getTargetMiId())); + record.setTargetMiInfo(marriageInformationQueryService.queryVo(record.getTargetMiId(), record.getTargetUserId())); }); } return page; @@ -66,8 +66,8 @@ public class EntrustServiceOrderQueryServiceImpl implements EntrustServiceOrderQ IPage page = entrustServiceOrderDao.pageOrderByMatchmaker(pageUtil.toPageWithoutOrders(), queryParams); if (page.getSize() > 0) { page.getRecords().forEach(record -> { - record.setInitiatorMiInfo(marriageInformationQueryService.queryVo(record.getInitiatorMiId())); - record.setTargetMiInfo(marriageInformationQueryService.queryVo(record.getTargetMiId())); + record.setInitiatorMiInfo(marriageInformationQueryService.queryVo(record.getInitiatorMiId(), record.getInitiatorUserId())); + record.setTargetMiInfo(marriageInformationQueryService.queryVo(record.getTargetMiId(), record.getTargetUserId())); }); } return page; @@ -79,8 +79,8 @@ public class EntrustServiceOrderQueryServiceImpl implements EntrustServiceOrderQ IPage page = entrustServiceOrderDao.pageOrder(pageUtil.toPageWithoutOrders(), queryParams); if (page.getSize() > 0) { page.getRecords().forEach(record -> { - record.setInitiatorMiInfo(marriageInformationQueryService.queryVo(record.getInitiatorMiId())); - record.setTargetMiInfo(marriageInformationQueryService.queryVo(record.getTargetMiId())); + record.setInitiatorMiInfo(marriageInformationQueryService.queryVo(record.getInitiatorMiId(), record.getInitiatorUserId())); + record.setTargetMiInfo(marriageInformationQueryService.queryVo(record.getTargetMiId(), record.getTargetUserId())); }); } return page; diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/marriageinformation/MarriageInformationQueryService.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/marriageinformation/MarriageInformationQueryService.java index 32d42dc..e14794d 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/marriageinformation/MarriageInformationQueryService.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/marriageinformation/MarriageInformationQueryService.java @@ -7,5 +7,5 @@ public interface MarriageInformationQueryService { MarriageInformation queryByUserId(Long userId); - MarriageInformationVo queryVo(Long id); + MarriageInformationVo queryVo(Long miId,Long userId); } diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/marriageinformation/impl/MarriageInformationQueryServiceImpl.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/marriageinformation/impl/MarriageInformationQueryServiceImpl.java index b863097..8e0ce11 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/marriageinformation/impl/MarriageInformationQueryServiceImpl.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/marriageinformation/impl/MarriageInformationQueryServiceImpl.java @@ -3,6 +3,7 @@ package com.qniao.dam.query.marriageinformation.impl; import com.qniao.dam.api.query.marriageinformation.response.MarriageInformationVo; import com.qniao.dam.infrastructure.persistent.dao.domain.MarriageInformationDao; import com.qniao.dam.infrastructure.utils.AgeCalculatorUtil; +import com.qniao.dam.query.account.AccountQueryService; import com.qniao.dam.query.marriageinformation.MarriageInformationQueryService; import com.qniao.dam.query.usermarriageinformation.UserMarriageInformationQueryService; import com.qniao.das.domian.aggregate.marriageinformation.MarriageInformation; @@ -20,6 +21,8 @@ public class MarriageInformationQueryServiceImpl implements MarriageInformationQ private UserMarriageInformationQueryService userMarriageInformationQueryService; @Resource private MarriageInformationDao marriageInformationDao; + @Resource + private AccountQueryService accountQueryService; @Override public MarriageInformation queryByUserId(Long userId) { @@ -28,12 +31,13 @@ public class MarriageInformationQueryServiceImpl implements MarriageInformationQ } @Override - public MarriageInformationVo queryVo(Long id) { + public MarriageInformationVo queryVo(Long miId, Long userId) { MarriageInformationVo vo = null; - MarriageInformation marriageInformation = marriageInformationDao.selectById(id); + MarriageInformation marriageInformation = marriageInformationDao.selectById(miId); if (Objects.nonNull(marriageInformation)) { vo = TypeConvertUtils.convert(marriageInformation, MarriageInformationVo.class); vo.setAge(AgeCalculatorUtil.calculateAge(vo.getBirthYear(), vo.getBirthDate())); + vo.setPhone(accountQueryService.queryPhone(userId)); } return vo; } diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/usermarriageinformation/UserMarriageInformationQueryService.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/usermarriageinformation/UserMarriageInformationQueryService.java index fba9e68..cde4994 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/usermarriageinformation/UserMarriageInformationQueryService.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/usermarriageinformation/UserMarriageInformationQueryService.java @@ -6,6 +6,6 @@ public interface UserMarriageInformationQueryService { UserMarriageInformation queryByOwn(Long userId); - UserMarriageInformation queryOwnByMiId(Long miId); + UserMarriageInformation queryByMiId(Long miId); } diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/usermarriageinformation/impl/UserMarriageInformationQueryServiceImpl.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/usermarriageinformation/impl/UserMarriageInformationQueryServiceImpl.java index 52fc587..760afba 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/usermarriageinformation/impl/UserMarriageInformationQueryServiceImpl.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/usermarriageinformation/impl/UserMarriageInformationQueryServiceImpl.java @@ -25,10 +25,9 @@ public class UserMarriageInformationQueryServiceImpl implements UserMarriageInfo } @Override - public UserMarriageInformation queryOwnByMiId(Long miId) { + public UserMarriageInformation queryByMiId(Long miId) { return userMarriageInformationDao.selectOne(new LambdaQueryWrapper() .eq(UserMarriageInformation::getMiId, miId) - .eq(UserMarriageInformation::getType, UserMarriageInformationTypeEnum.OWN) .last("limit 1")); }