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 68e50b2..b145e8f 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 @@ -223,7 +223,7 @@ public class OrderApplicationService extends BaseApplicationService { if (Objects.isNull(marriageBountyOrder.getMatchmakerId())) { //没有人邀请发榜 RewardConfig rewardConfig = rewardConfigQueryService.queryByRewardType(RewardTypeEnum.MARRIAGE_BOUNTY_MATCHMAKER_PROTECTION_PERIOD); - MatchmakerMarriageInformation matchmakerMarriageInformation = matchmakerMarriageInformationQueryService.queryByRecommend(marriageBountyOrder.getUserId(), null); + MatchmakerMarriageInformation matchmakerMarriageInformation = matchmakerMarriageInformationQueryService.queryByRecommend(marriageBountyOrder.getUserId()); if (Objects.nonNull(rewardConfig) && Objects.nonNull(matchmakerMarriageInformation) && LocalDateTime.now().isBefore(rewardConfig.getPeriodTime(matchmakerMarriageInformation.getCreateTime()))) { marriageBountyOrder.setMatchmakerId(matchmakerMarriageInformation.getMatchmakerId()); diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/matchmakermarriage/MatchmakerMarriageInformationQueryService.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/matchmakermarriage/MatchmakerMarriageInformationQueryService.java index 9cc4b05..37b882c 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/matchmakermarriage/MatchmakerMarriageInformationQueryService.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/matchmakermarriage/MatchmakerMarriageInformationQueryService.java @@ -4,6 +4,6 @@ import com.qniao.das.domian.aggregate.matchmakermarriage.MatchmakerMarriageInfor public interface MatchmakerMarriageInformationQueryService { - MatchmakerMarriageInformation queryByRecommend(Long userId, Long miId); + MatchmakerMarriageInformation queryByRecommend(Long userId); } diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/matchmakermarriage/impl/MatchmakerMarriageInformationQueryServiceImpl.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/matchmakermarriage/impl/MatchmakerMarriageInformationQueryServiceImpl.java index 227b5ef..e009b60 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/matchmakermarriage/impl/MatchmakerMarriageInformationQueryServiceImpl.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/matchmakermarriage/impl/MatchmakerMarriageInformationQueryServiceImpl.java @@ -17,14 +17,9 @@ public class MatchmakerMarriageInformationQueryServiceImpl implements Matchmaker private MatchmakerMarriageInformationDao matchmakerMarriageInformationDao; @Override - public MatchmakerMarriageInformation queryByRecommend(Long userId, Long miId) { + public MatchmakerMarriageInformation queryByRecommend(Long userId) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(MatchmakerMarriageInformation::getUserId, userId); - if (Objects.nonNull(miId)) { - wrapper.eq(MatchmakerMarriageInformation::getMiId, miId); - } else { - wrapper.isNull(MatchmakerMarriageInformation::getMiId); - } wrapper.eq(MatchmakerMarriageInformation::getRelationType, RelationTypeEnum.RECOMMEND); wrapper.last("limit 1"); return matchmakerMarriageInformationDao.selectOne(wrapper);