jiangqs
2023-06-04 e9e504197c8e2fc9327d0fe6bdf7f513170594ab
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java
@@ -668,14 +668,13 @@
        List<Activeness> activenessList = remoteConfigService.listActiveness().getData();
        Date nowDay = DateUtils.getNowDate();
        //处理活跃度筛选
        if(activenessList!=null&&!activenessList.isEmpty()){
            for(Activeness activeness : activenessList){
               if(activeness.getActivenessId().equals(merMemberPageDto.getActivenessId())){
                   merMemberPageDto.setActStartDate(DateUtils.addDays(nowDay,activeness.getEndDay()));
                   merMemberPageDto.setActEndDate(DateUtils.addDays(nowDay,activeness.getStartDay()));
               }
            }
        }
        activenessList.stream()
                .filter(activeness -> activeness.getActivenessId().equals(merMemberPageDto.getActivenessId()))
                .findFirst()
                .ifPresent(activeness -> {
                    merMemberPageDto.setActStartDate(DateUtils.addDays(nowDay, activeness.getEndDay()));
                    merMemberPageDto.setActEndDate(DateUtils.addDays(nowDay, activeness.getStartDay()));
                });
        //查询获取结果列表
        List<MgtMemberPageVo> memberPageVoList = memberMapper.pageMgtMember(page, merMemberPageDto);
        //处理活跃度返回