Skip to content

J
jiedao-api-boot-master
Commit 0c505b75 authored by Smile's avatar Smile
Browse files
Options

fix:会员等级详情修改会员等级有效期为日期，取消去除失效日期积分逻辑

parent e9a292e6
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 17 deletions
yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/controller/admin/levelDetails/MemberUserLevelDetailsController.java
View file @ 0c505b75
......@@ -65,7 +65,7 @@ public class MemberUserLevelDetailsController {
}
LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
memberUserLevelDetailsDO.setLevel(reqVO.getLevel());
memberUserLevelDetailsDO.setValidityPeriod(configDO.getValidityPeriod());
memberUserLevelDetailsDO.setValidityPeriod(reqVO.getValidityPeriod());
memberUserLevelDetailsDO.setSpecificSettings(reqVO.getSpecificSettings());
memberUserLevelDetailsDO.setRemarks(reqVO.getRemarks());
memberUserLevelDetailsDO.setConfigId(configDO.getId());
......
yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/memberUserLevelDetail/MemberUserLevelDetailsDO.java
View file @ 0c505b75
......@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.*;
import java.util.Date;
/**
* @author Smile
*/
......@@ -28,7 +30,7 @@ public class MemberUserLevelDetailsDO extends BaseDO {
private Integer level;
private Integer validityPeriod;
private Date validityPeriod;
private Boolean specificSettings;
......
yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/job/userLevelDetailsTask.java
View file @ 0c505b75
......@@ -99,10 +99,6 @@ public class userLevelDetailsTask implements JobHandler {
int reduceScore = 0;
// 遍历积分记录列表
for (MemberUserScoreLogBackVO scoreLog : scoreLogs) {
// 打印每个积分记录的详细信息
if (scoreLog.getExpireTime()!= null && scoreLog.getExpireTime().before(new Date())){
continue;
}
//增加积分
if (scoreLog.getOperateType()==1){
addScore+=scoreLog.getScoreCount();
......@@ -143,7 +139,9 @@ public class userLevelDetailsTask implements JobHandler {
memberUserLevelDetailsDO.setMemberId(memberId);
memberUserLevelDetailsDO.setLevel(memberUserLevelConfigDO.getLevel());
memberUserLevelDetailsDO.setSpecificSettings(false);
memberUserLevelDetailsDO.setValidityPeriod(memberUserLevelConfigDO.getValidityPeriod());
if (memberUserLevelConfigDO.getValidityPeriod()!=null){
memberUserLevelDetailsDO.setValidityPeriod(DateUtils.getNextNDayStart(new Date(), memberUserLevelConfigDO.getValidityPeriod()));
}
memberUserLevelDetailsDO.setRemarks(memberUserLevelConfigDO.getDescription());
memberUserLevelDetailsDO.setConfigId(memberUserLevelConfigDO.getId());
memberUserLevelDetailsDO.setCreator(String.valueOf(user.getId()));
......@@ -178,7 +176,9 @@ public class userLevelDetailsTask implements JobHandler {
memberUserLevelDetailsDO.setMemberId(memberUserLevelDetailsBackVO.getMemberId());
memberUserLevelDetailsDO.setLevel(memberUserLevelConfigDO.getLevel());
memberUserLevelDetailsDO.setSpecificSettings(memberUserLevelDetailsBackVO.getSpecificSettings());
memberUserLevelDetailsDO.setValidityPeriod(memberUserLevelConfigDO.getValidityPeriod());
if (memberUserLevelConfigDO.getValidityPeriod()!=null){
memberUserLevelDetailsDO.setValidityPeriod((DateUtils.getNextNDayStart(new Date(), memberUserLevelConfigDO.getValidityPeriod())));
}
memberUserLevelDetailsDO.setRemarks(memberUserLevelConfigDO.getDescription());
memberUserLevelDetailsDO.setConfigId(memberUserLevelConfigDO.getId());
memberUserLevelDetailsDO.setUpdater(String.valueOf(user.getId()));
......@@ -207,7 +207,9 @@ public class userLevelDetailsTask implements JobHandler {
memberUserLevelDetailsDO.setMemberId(memberUserLevelDetailsBackVO.getMemberId());
memberUserLevelDetailsDO.setLevel(memberUserLevelConfigDO.getLevel());
memberUserLevelDetailsDO.setSpecificSettings(memberUserLevelDetailsBackVO.getSpecificSettings());
memberUserLevelDetailsDO.setValidityPeriod(memberUserLevelConfigDO.getValidityPeriod());
if (memberUserLevelConfigDO.getValidityPeriod()!=null){
memberUserLevelDetailsDO.setValidityPeriod((DateUtils.getNextNDayStart(new Date(), memberUserLevelConfigDO.getValidityPeriod())));
}
memberUserLevelDetailsDO.setRemarks(memberUserLevelConfigDO.getDescription());
memberUserLevelDetailsDO.setConfigId(memberUserLevelConfigDO.getId());
memberUserLevelDetailsDO.setUpdater(String.valueOf(user.getId()));
......@@ -226,7 +228,7 @@ public class userLevelDetailsTask implements JobHandler {
}
}else{
//查看创建时间加上有效期是否小于于当前时间,进行降级
if (memberUserLevelDetailsBackVO.getValidityPeriod()!=null&&memberUserLevelDetailsBackVO.getCreateTime().getTime()+memberUserLevelDetailsBackVO.getValidityPeriod()*24*60*60*1000<new Date().getTime()){
if (memberUserLevelDetailsBackVO.getValidityPeriod()!=null&&memberUserLevelDetailsBackVO.getValidityPeriod().before(new Date())){
//设置用户为admin
//设置降级等级
MemberUserLevelDetailsDO memberUserLevelDetailsDO=new MemberUserLevelDetailsDO();
......@@ -234,7 +236,9 @@ public class userLevelDetailsTask implements JobHandler {
memberUserLevelDetailsDO.setMemberId(memberUserLevelDetailsBackVO.getMemberId());
memberUserLevelDetailsDO.setLevel(memberUserLevelConfigDO.getLevel());
memberUserLevelDetailsDO.setSpecificSettings(memberUserLevelDetailsBackVO.getSpecificSettings());
memberUserLevelDetailsDO.setValidityPeriod(memberUserLevelConfigDO.getValidityPeriod());
if (memberUserLevelConfigDO.getValidityPeriod()!=null){
memberUserLevelDetailsDO.setValidityPeriod((DateUtils.getNextNDayStart(new Date(), memberUserLevelConfigDO.getValidityPeriod())));
}
memberUserLevelDetailsDO.setRemarks(memberUserLevelConfigDO.getDescription());
memberUserLevelDetailsDO.setConfigId(memberUserLevelConfigDO.getId());
memberUserLevelDetailsDO.setUpdater(String.valueOf(user.getId()));
......@@ -264,7 +268,9 @@ public class userLevelDetailsTask implements JobHandler {
memberUserLevelDetailsDO.setMemberId(memberUserLevelDetailsBackVO.getMemberId());
memberUserLevelDetailsDO.setLevel(memberUserLevelConfigDO.getLevel());
memberUserLevelDetailsDO.setSpecificSettings(memberUserLevelDetailsBackVO.getSpecificSettings());
memberUserLevelDetailsDO.setValidityPeriod(memberUserLevelConfigDO.getValidityPeriod());
if (memberUserLevelConfigDO.getValidityPeriod()!=null){
memberUserLevelDetailsDO.setValidityPeriod((DateUtils.getNextNDayStart(new Date(), memberUserLevelConfigDO.getValidityPeriod())));
}
memberUserLevelDetailsDO.setRemarks(memberUserLevelConfigDO.getDescription());
memberUserLevelDetailsDO.setConfigId(memberUserLevelConfigDO.getId());
memberUserLevelDetailsDO.setUpdater(String.valueOf(user.getId()));
......@@ -293,7 +299,9 @@ public class userLevelDetailsTask implements JobHandler {
memberUserLevelDetailsDO.setMemberId(memberUserLevelDetailsBackVO.getMemberId());
memberUserLevelDetailsDO.setLevel(memberUserLevelConfigDO.getLevel());
memberUserLevelDetailsDO.setSpecificSettings(memberUserLevelDetailsBackVO.getSpecificSettings());
memberUserLevelDetailsDO.setValidityPeriod(memberUserLevelConfigDO.getValidityPeriod());
if (memberUserLevelConfigDO.getValidityPeriod()!=null){
memberUserLevelDetailsDO.setValidityPeriod((DateUtils.getNextNDayStart(new Date(), memberUserLevelConfigDO.getValidityPeriod())));
}
memberUserLevelDetailsDO.setRemarks(memberUserLevelConfigDO.getDescription());
memberUserLevelDetailsDO.setConfigId(memberUserLevelConfigDO.getId());
memberUserLevelDetailsDO.setUpdater(String.valueOf(user.getId()));
......
yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/service/levelDetails/MemberUserLevelDetailsService.java
View file @ 0c505b75
......@@ -6,7 +6,6 @@ import cn.iocoder.yudao.module.member.dal.dataobject.memberUserLevelDetail.Membe
import cn.iocoder.yudao.module.member.vo.userLevelDetails.MemberUserLevelDetailsBackVO;
import cn.iocoder.yudao.module.member.vo.userLevelDetails.MemberUserLevelDetailsQueryVO;
import javax.validation.Valid;
/**
* 会员等级详情 Service 接口
......
yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/vo/userLevelDetails/MemberUserLevelDetailsBackVO.java
View file @ 0c505b75
......@@ -33,7 +33,7 @@ public class MemberUserLevelDetailsBackVO {
private Integer level;
@ApiModelProperty(value = "等级有效期")
private Integer validityPeriod;
private Date validityPeriod;
@ApiModelProperty(value = "等级特殊设置")
private Boolean specificSettings;
......
yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/vo/userLevelDetails/MemberUserLevelDetailsCreateReq.java
View file @ 0c505b75
......@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Builder;
import lombok.Data;
import java.util.Date;
/**
* @author Smile
*/
......@@ -20,7 +22,7 @@ public class MemberUserLevelDetailsCreateReq {
private Integer level;
@ApiModelProperty(value = "等级有效期")
private Integer validityPeriod;
private Date validityPeriod;
@ApiModelProperty(value = "等级特殊设置")
private Boolean specificSettings;
......
yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/vo/userLevelDetails/MemberUserLevelDetailsQueryVO.java
View file @ 0c505b75
......@@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* @author Smile
*/
......@@ -25,7 +27,7 @@ public class MemberUserLevelDetailsQueryVO extends PageParam {
private Integer level;
@ApiModelProperty(value = "等级有效期")
private Integer validityPeriod;
private Date validityPeriod;
@ApiModelProperty(value = "等级特殊设置")
private Boolean specificSettings;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment