From 9cdb4d78e0a21d3803bb46b3a49099fabff727b1 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 11 六月 2024 18:20:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberLevelServiceImpl.java | 18 ++++++++++++++----
1 files changed, 14 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..352b823 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,5 +1,6 @@
package com.ruoyi.member.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.utils.StringUtils;
@@ -8,6 +9,7 @@
import com.ruoyi.member.controller.management.vo.MgtMemberLevelVO;
import com.ruoyi.member.domain.MemberLevel;
import com.ruoyi.member.mapper.MemberLevelMapper;
+import com.ruoyi.member.mapper.MemberMapper;
import com.ruoyi.member.service.IMemberLevelService;
import com.ruoyi.member.service.IMemberService;
import com.ruoyi.member.service.async.AsyncMethodService;
@@ -32,7 +34,7 @@
@RequiredArgsConstructor
public class MemberLevelServiceImpl extends ServiceImpl<MemberLevelMapper, MemberLevel> implements IMemberLevelService {
- private final IMemberService memberService;
+ private final MemberMapper memberMapper;
private final AsyncMethodService asyncMethodService;
/**
* 获取会员等级管理列表
@@ -43,16 +45,24 @@
public List<MgtMemberLevelVO> getMemberLevelList() {
List<MemberLevel> list = this.lambdaQuery().orderByAsc(MemberLevel::getLevel).list();
List<MgtMemberLevelVO> mgtMemberLevelVOS = BeanUtils.copyList(list, MgtMemberLevelVO.class);
+ LambdaQueryWrapper<Member> wrapper= Wrappers.lambdaQuery();
+ List<Member> memberList = memberMapper.selectList(wrapper);
+ 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