mitao
2024-06-09 c80281c4269623609f5b815d60b241f5462de9cc
ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/PromotionWishListServiceImpl.java
@@ -85,17 +85,22 @@
    public PageDTO<MgtPromotionWishListVO> getPromotionWishListPage(
            MgtPromotionWishListQuery query) {
        // 封装会员条件查询对象
        MemberDTO memberDTO = new MemberDTO();
        if (StringUtils.isNotBlank(query.getNickname())) {
        MemberDTO memberDTO = null;
        Set<Long> memberIdSet = null;
        if (StringUtils.isNotBlank(query.getNickname()) || StringUtils.isNotBlank(
                query.getPhone())) {
            memberDTO = new MemberDTO();
            memberDTO.setNickname(query.getNickname());
        }
        if (StringUtils.isNotBlank(query.getPhone())) {
            memberDTO.setPhone(query.getPhone());
        }
        // 远程调用会员服务进行条件查询
        List<Member> memberList = memberClient.getMemberListByCondition(memberDTO,
                SecurityConstants.INNER).getData();
        Set<Long> memberIdSet = memberList.stream().map(Member::getId).collect(Collectors.toSet());
        if (StringUtils.isNotNull(memberDTO)) {
            // 远程调用会员服务进行条件查询
            List<Member> memberList = memberClient.getMemberListByCondition(memberDTO,
                    SecurityConstants.INNER).getData();
            memberIdSet = memberList.stream().map(Member::getId)
                    .collect(Collectors.toSet());
        }
        // 分页查询心愿求购列表
        Page<PromotionWishList> page = this.lambdaQuery()
                .eq(StringUtils.isNotNull(query.getReplyStatus()),