修改bug

rentaiming

2024-07-15 5674594f06ec038a5ac1633b881518ffbd8c6c02

 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);
        }