From 92da9546e1b37b06f78671b34389b1dec9dfadfc Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期二, 06 六月 2023 13:57:42 +0800
Subject: [PATCH] 基础配置
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java
index fe39f94..f794ba1 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java
@@ -666,16 +666,15 @@
@Override
public List<MgtMemberPageVo> pageMgtMember(Page page,MgtMemberPageDto merMemberPageDto){
List<Activeness> activenessList = remoteConfigService.listActiveness().getData();
- Date nowDay = DateUtils.getNowDate();
+ Date nowDay = new Date();
//处理活跃度筛选
- 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);
//处理活跃度返回
@@ -750,6 +749,7 @@
public void editMemberIntegral(MgtMemberIntEditDto mgtMemberIntEditDto){
MemberIntegralChangeDto memberIntegralChangeDto = new MemberIntegralChangeDto();
Member member = this.getByUserId(mgtMemberIntEditDto.getMemberUserId());
+ memberIntegralChangeDto.setUserId(mgtMemberIntEditDto.getMemberUserId());
memberIntegralChangeDto.setMemberId(member.getMemberId());
memberIntegralChangeDto.setChangeType(1);
memberIntegralChangeDto.setRecordType(3);
@@ -793,6 +793,7 @@
//记录变动
IntegralRecord integralRecord = new IntegralRecord();
integralRecord.setDelFlag(0);
+ integralRecord.setUserId(memberIntegralChangeDto.getUserId());
integralRecord.setChangeType(recordType);
if(changeType==1){
integralRecord.setChangeIntegral(integer);
--
Gitblit v1.7.1