From b29becf95484be48aa09e87fcc7cc19f94cf9c81 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期三, 10 七月 2024 18:16:23 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberPointsServiceImpl.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberPointsServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberPointsServiceImpl.java
index 05e3d6d..05885ba 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberPointsServiceImpl.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberPointsServiceImpl.java
@@ -42,6 +42,7 @@
Page<MemberPoints> page = new Page<>(memberDTO.getPageCurr(), memberDTO.getPageSize());
LambdaQueryWrapper<MemberPoints> wrapper= Wrappers.lambdaQuery();
wrapper.eq(MemberPoints::getMemberId,memberDTO.getMemberid());
+ wrapper.orderByDesc(MemberPoints::getCreateTime);
Page<MemberPoints> page1 = this.page(page, wrapper);
return PageDTO.of(page1);
}
@@ -55,16 +56,21 @@
@Override
public PageDTO<MgtMemberPointsVO> getMemberPointsPage(MgtMemberPointsQuery query) {
Set<Long> memberIdSet = null;
+ Page<MemberPoints> page = new Page<>(query.getPageCurr(), query.getPageSize());
MemberDTO memberDTO = getMemberQueryParam(query);
if (StringUtils.isNotNull(memberDTO)) {
memberIdSet = getMemberIdSet(memberDTO);
+ if (StringUtils.isEmpty(memberIdSet)) {
+ return PageDTO.empty(page);
+ }
}
// 分页查询积分
- Page<MemberPoints> page = this.lambdaQuery()
+ page = this.lambdaQuery()
.eq(StringUtils.isNotNull(query.getPointsStatus()), MemberPoints::getPointsStatus,
query.getPointsStatus())
.in(StringUtils.isNotEmpty(memberIdSet), MemberPoints::getMemberId, memberIdSet)
- .page(new Page<>(query.getPageCurr(), query.getPageSize()));
+ .orderByDesc(MemberPoints::getCreateTime)
+ .page(page);
if (StringUtils.isEmpty(page.getRecords())) {
return PageDTO.empty(page);
}
--
Gitblit v1.7.1