java/HongRuiTang.git

			@@ -21,7 +21,10 @@
			import com.ruoyi.member.domain.pojo.member.MemberTotal;
			import com.ruoyi.member.domain.vo.*;
			import com.ruoyi.member.mapper.member.MemberMapper;
			import com.ruoyi.member.service.member.*;
			import com.ruoyi.member.service.member.IntegralRecordService;
			import com.ruoyi.member.service.member.MemberArchiveService;
			import com.ruoyi.member.service.member.MemberService;
			import com.ruoyi.member.service.member.MemberTotalService;
			import com.ruoyi.member.util.HttpUtils;
			import com.ruoyi.system.api.constant.AppErrorConstant;
			import com.ruoyi.system.api.constant.SecurityConstant;
			@@ -46,6 +49,8 @@

			import javax.annotation.Resource;
			import java.math.BigDecimal;
			import java.time.LocalDate;
			import java.time.format.DateTimeFormatter;
			import java.util.*;
			import java.util.concurrent.TimeUnit;
			import java.util.stream.Collectors;
			@@ -840,6 +845,19 @@
			if (StringUtils.isNotBlank(merMemberPageDto.getMemberTags())) {
			merMemberPageDto.setMemberTags(merMemberPageDto.getMemberTags().replace(",", "\|"));
			}
			//处理生日
			if(merMemberPageDto.getStartAge()!=null){
			LocalDate currentDate = LocalDate.now();
			LocalDate endBirthday = currentDate.minusYears(merMemberPageDto.getStartAge());
			DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
			merMemberPageDto.setEndBirthday(endBirthday.format(formatter));
			}
			if(merMemberPageDto.getEndAge()!=null){
			LocalDate currentDate = LocalDate.now();
			LocalDate startBirthday = currentDate.minusYears(merMemberPageDto.getEndAge());
			DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
			merMemberPageDto.setStartBirthday(startBirthday.format(formatter));
			}
			//查询获取结果列表
			List<MgtMemberPageVo> memberPageVoList = memberMapper.pageMgtMember(page, merMemberPageDto);
			//处理活跃度返回