From 2f2eb2bb2c6a5a16b7081dbbe3b683acf18d04bc Mon Sep 17 00:00:00 2001 From: rentaiming <806181062@qq.com> Date: 星期二, 11 六月 2024 18:18:05 +0800 Subject: [PATCH] 用户端商品 --- ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/PromotionWishListServiceImpl.java | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/PromotionWishListServiceImpl.java b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/PromotionWishListServiceImpl.java index 2fbca28..b583f35 100644 --- a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/PromotionWishListServiceImpl.java +++ b/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()), -- Gitblit v1.7.1