From fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 29 七月 2024 18:51:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/PromotionWishListServiceImpl.java | 34 +++++++++++++++++++++++-----------
1 files changed, 23 insertions(+), 11 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..f5afd23 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
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.collect.Lists;
import com.ruoyi.common.core.constant.SecurityConstants;
+import com.ruoyi.common.core.enums.ReplyStatusEnum;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.page.BeanUtils;
@@ -47,6 +48,7 @@
Page<PromotionWishList> page = new Page<>(promotionWishListDTO.getPageCurr(), promotionWishListDTO.getPageSize());
LambdaQueryWrapper<PromotionWishList> wrapper= Wrappers.lambdaQuery();
wrapper.eq(PromotionWishList::getMemberId,promotionWishListDTO.getMemberId());
+ wrapper.orderByDesc(PromotionWishList::getCreateTime);
Page<PromotionWishList> page1 = this.page(page, wrapper);
return PageDTO.of(page1);
}
@@ -85,24 +87,33 @@
public PageDTO<MgtPromotionWishListVO> getPromotionWishListPage(
MgtPromotionWishListQuery query) {
// 封装会员条件查询对象
- MemberDTO memberDTO = new MemberDTO();
- if (StringUtils.isNotBlank(query.getNickname())) {
+ MemberDTO memberDTO = null;
+ Set<Long> memberIdSet = null;
+ Page<PromotionWishList> page = new Page<>(query.getPageCurr(), query
+ .getPageSize());
+ 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();
+ if (StringUtils.isEmpty(memberList)) {
+ return PageDTO.empty(page);
+ }
+ memberIdSet = memberList.stream().map(Member::getId)
+ .collect(Collectors.toSet());
+ }
+
// 分页查询心愿求购列表
- Page<PromotionWishList> page = this.lambdaQuery()
+ page = this.lambdaQuery()
.eq(StringUtils.isNotNull(query.getReplyStatus()),
PromotionWishList::getReplyStatus, query.getReplyStatus())
.in(StringUtils.isNotEmpty(memberIdSet), PromotionWishList::getMemberId,
- memberIdSet).page(new Page<>(query.getPageCurr(), query
- .getPageSize()));
+ memberIdSet).orderByDesc(PromotionWishList::getCreateTime).page(page);
if (StringUtils.isEmpty(page.getRecords())) {
return PageDTO.empty(page);
}
@@ -164,6 +175,7 @@
public void reply(MgtPromotionWishListDTO dto) {
PromotionWishList promotionWishList = this.getById(dto.getId());
promotionWishList.setReplies(dto.getReplies());
+ promotionWishList.setReplyStatus(ReplyStatusEnum.REPLIED);
this.updateById(promotionWishList);
}
}
--
Gitblit v1.7.1