bug修改

mitao

2025-03-14 392b42c4891cf2e6beda57ab32c51598f290f4b7

 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,8 +9,8 @@
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;
import com.ruoyi.system.api.domain.Member;
import java.util.List;
@@ -32,7 +33,7 @@
@RequiredArgsConstructor
public class MemberLevelServiceImpl extends ServiceImpl<MemberLevelMapper, MemberLevel> implements IMemberLevelService {

    private final IMemberService memberService;
    private final MemberMapper memberMapper;
    private final AsyncMethodService asyncMethodService;
    /**
     * 获取会员等级管理列表
@@ -43,25 +44,34 @@
    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();
    }

    /**
     * 保存会员等级配置
     *
     * @param memberLevelDTOList 会员等级配置列表
     * @param dto 会员等级配置列表
     */
    @Override
    @Transactional(propagation = Propagation.REQUIRES_NEW)
    public void saveOrUpdateMemberLevel(List<MgtMemberLevelDTO> memberLevelDTOList) {
        List<MemberLevel> memberLevels = BeanUtils.copyList(memberLevelDTOList, MemberLevel.class);
    public void saveOrUpdateMemberLevel(MgtMemberLevelDTO dto) {
        List<MemberLevel> memberLevels = BeanUtils.copyList(dto.getMemberLevelDTOList(),
                MemberLevel.class);
        this.saveOrUpdateBatch(memberLevels);
        asyncMethodService.handleMemberLevel(memberLevels);
    }