Skip to content

C
cloud-platform
Commit 7b4ff4b2 authored by hezhen's avatar hezhen
Browse files
Options

修改会员

parent 184db02f
Show whitespace changes
Inline Side-by-side
Showing with 24 additions and 7 deletions
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/BaseUserMemberBiz.java
View file @ 7b4ff4b2
...@@ -90,18 +90,25 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper,BaseUserMemb ...@@ -90,18 +90,25 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper,BaseUserMemb
UserMemberVo userMemberVo=getMemberInfoByUserId(userId); UserMemberVo userMemberVo=getMemberInfoByUserId(userId);
if(userMemberVo!=null){ if(userMemberVo!=null){
days=days==null?0:days; days=days==null?0:days;
Integer freeDays=userMemberVo.getRentFreeDays()==null?userMemberVo.getRentFreeDays():0; Integer freeDays=userMemberVo.getRentFreeDays()==null?0:userMemberVo.getRentFreeDays();
Integer lockDays=userMemberVo.getLockDays()==null?userMemberVo.getLockDays():0; // Integer lockDays=userMemberVo.getLockDays()==null?userMemberVo.getLockDays():0;
Integer totalNumber=userMemberVo.getTotalNumber()==null?0:userMemberVo.getTotalNumber();
BaseUserMember baseUserMember=new BaseUserMember(); BaseUserMember baseUserMember=new BaseUserMember();
baseUserMember.setId(userMemberVo.getId()); baseUserMember.setId(userMemberVo.getId());
if(type==1){ if(type==1){
if((freeDays-lockDays)>0&&(freeDays-lockDays)>=days){ /*if((freeDays-lockDays)>0&&(freeDays-lockDays)>=days){
baseUserMember.setLockDays(lockDays+days); baseUserMember.setLockDays(lockDays+days);
updateSelectiveById(baseUserMember); updateSelectiveById(baseUserMember);
num=freeDays-(lockDays+days); num=freeDays-(lockDays+days);
}*/
if(freeDays>0&&freeDays>=days){
freeDays=freeDays-days;
baseUserMember.setRentFreeDays(freeDays);
updateSelectiveById(baseUserMember);
num=freeDays;
} }
}else if(type==2){ }else if(type==2){
Integer payCount=userMemberVo.getPayCount()==null?0:userMemberVo.getPayCount(); /*Integer payCount=userMemberVo.getPayCount()==null?0:userMemberVo.getPayCount();
payCount=payCount+1; payCount=payCount+1;
freeDays=(freeDays-days)>0?(freeDays-days):0; freeDays=(freeDays-days)>0?(freeDays-days):0;
lockDays=lockDays>0?(lockDays-days)>0?(lockDays-days):0:0; lockDays=lockDays>0?(lockDays-days)>0?(lockDays-days):0:0;
...@@ -109,12 +116,22 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper,BaseUserMemb ...@@ -109,12 +116,22 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper,BaseUserMemb
baseUserMember.setPayCount(payCount); baseUserMember.setPayCount(payCount);
baseUserMember.setLockDays(lockDays); baseUserMember.setLockDays(lockDays);
updateSelectiveById(baseUserMember); updateSelectiveById(baseUserMember);
num=freeDays-lockDays; num=freeDays-lockDays;*/
Integer payCount=userMemberVo.getPayCount()==null?0:userMemberVo.getPayCount();
payCount=payCount+1;
baseUserMember.setPayCount(payCount);
updateSelectiveById(baseUserMember);
num=freeDays;
}else { }else {
lockDays=lockDays>0?(lockDays-days)>0?(lockDays-days):0:0; /*lockDays=lockDays>0?(lockDays-days)>0?(lockDays-days):0:0;
baseUserMember.setLockDays(lockDays); baseUserMember.setLockDays(lockDays);
updateSelectiveById(baseUserMember); updateSelectiveById(baseUserMember);
num=freeDays-lockDays; num=freeDays-lockDays;*/
freeDays=(freeDays+days)>0?(freeDays+days):0;
freeDays=freeDays>totalNumber?totalNumber:freeDays;
baseUserMember.setRentFreeDays(freeDays);
updateSelectiveById(baseUserMember);
num=freeDays;
} }
} }
......
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