From 3d1c46677a3fb95a4d776735925047c08dee17a3 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期五, 07 六月 2024 18:17:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberLevelServiceImpl.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberLevelServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberLevelServiceImpl.java
index 17418e8..df56a7f 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberLevelServiceImpl.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberLevelServiceImpl.java
@@ -1,6 +1,5 @@
package com.ruoyi.member.service.impl;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.page.BeanUtils;
@@ -43,16 +42,23 @@
public List<MgtMemberLevelVO> getMemberLevelList() {
List<MemberLevel> list = this.lambdaQuery().orderByAsc(MemberLevel::getLevel).list();
List<MgtMemberLevelVO> mgtMemberLevelVOS = BeanUtils.copyList(list, MgtMemberLevelVO.class);
+ List<Member> memberList = memberService.list();
+ Integer level = 0;
+
if (StringUtils.isNotEmpty(mgtMemberLevelVOS)) {
+
for (MgtMemberLevelVO vo : mgtMemberLevelVOS) {
- long count = memberService.count(
- Wrappers.<Member>lambdaQuery().eq(Member::getLevel, vo.getLevel()));
- vo.setCurrentNumber((int) count);
+
+ vo.setCurrentNumber(getMemberCountByLevel(memberList, vo.getLevel()));
}
}
return mgtMemberLevelVOS;
}
+ private static int getMemberCountByLevel(List<Member> memberList, Integer level) {
+ return (int) memberList.stream().filter(member -> member.getLevel().equals(level)).count();
+ }
+
/**
* 保存会员等级配置
*
--
Gitblit v1.7.1