VIP改版
This commit is contained in:
@@ -2,10 +2,8 @@ package com.peanut.modules.master.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.peanut.common.utils.R;
|
||||
import com.peanut.modules.common.entity.MyUserEntity;
|
||||
import com.peanut.modules.common.entity.UserVip;
|
||||
import com.peanut.modules.common.entity.UserVipLog;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
@@ -15,6 +13,4 @@ public interface MyUserService extends IService<MyUserEntity> {
|
||||
|
||||
Page<UserVip> getVipHistoryList(Map<String, Object> params);
|
||||
|
||||
R activateVIP(UserVipLog vipLog);
|
||||
|
||||
}
|
||||
|
||||
@@ -12,17 +12,15 @@ import com.peanut.common.utils.ShiroUtils;
|
||||
import com.peanut.common.utils.SpdbUtil;
|
||||
import com.peanut.modules.common.dao.*;
|
||||
import com.peanut.modules.common.entity.*;
|
||||
import com.peanut.modules.common.service.UserVipService;
|
||||
import com.peanut.modules.common.to.ParamTo;
|
||||
import com.peanut.modules.master.service.CourseCatalogueChapterVideoService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.xml.ws.soap.Addressing;
|
||||
import java.util.Calendar;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@Slf4j
|
||||
@Service("masterCourseCatalogueChapterVideoService")
|
||||
@@ -40,9 +38,7 @@ public class CourseCatalogueChapterVideoServiceImpl extends ServiceImpl<CourseCa
|
||||
@Autowired
|
||||
private UserCourseBuyDao userCourseBuyDao;
|
||||
@Autowired
|
||||
private CourseToSociologyDao courseToSociologyDao;
|
||||
@Autowired
|
||||
private CourseToMedicineDao courseToMedicineDao;
|
||||
private UserVipService userVipService;
|
||||
@Autowired
|
||||
private MyUserDao userDao;
|
||||
@Autowired
|
||||
@@ -186,21 +182,10 @@ public class CourseCatalogueChapterVideoServiceImpl extends ServiceImpl<CourseCa
|
||||
}
|
||||
|
||||
private boolean courseCheckVip(MyUserEntity u,int courseId){
|
||||
if(u.getVip().equals("1")){
|
||||
UserVip userVip = userVipService.ownCourseCatalogueByVip(courseId);
|
||||
if (userVip != null) {
|
||||
return true;
|
||||
}
|
||||
if(u.getVip().equals("3")){
|
||||
Integer integer = courseToSociologyDao.selectCount(new LambdaQueryWrapper<CourseToSociologyEntity>().eq(CourseToSociologyEntity::getCourseId, courseId));
|
||||
if(integer>0){
|
||||
return true;
|
||||
}
|
||||
}
|
||||
if(u.getVip().equals("2")){
|
||||
Integer integer = courseToMedicineDao.selectCount(new LambdaQueryWrapper<CourseToMedicine>().eq(CourseToMedicine::getCourseId, courseId));
|
||||
if(integer>0){
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,25 +1,17 @@
|
||||
package com.peanut.modules.master.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.github.yulichang.wrapper.MPJLambdaWrapper;
|
||||
import com.peanut.common.utils.DateUtil;
|
||||
import com.peanut.common.utils.R;
|
||||
import com.peanut.common.utils.ShiroUtils;
|
||||
import com.peanut.modules.common.dao.MyUserDao;
|
||||
import com.peanut.modules.common.dao.UserVipDao;
|
||||
import com.peanut.modules.common.dao.UserVipLogDao;
|
||||
import com.peanut.modules.common.entity.*;
|
||||
import com.peanut.modules.master.service.MyUserService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.commons.lang.time.DateUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@Slf4j
|
||||
@@ -43,7 +35,7 @@ public class MyUserServiceImpl extends ServiceImpl<MyUserDao, MyUserEntity> impl
|
||||
wrapper.selectAs(UserVip::getEndTime,"endTime");
|
||||
wrapper.leftJoin(UserVip.class,UserVip::getUserId,MyUserEntity::getId);
|
||||
if (!"0".equals(params.get("type").toString())){
|
||||
wrapper.eq(MyUserEntity::getVip,params.get("type"));
|
||||
wrapper.eq(UserVip::getType,params.get("type"));
|
||||
}
|
||||
wrapper.eq(UserVip::getState,0);
|
||||
if (StringUtils.isNotBlank(params.get("userWords").toString())){
|
||||
@@ -71,48 +63,5 @@ public class MyUserServiceImpl extends ServiceImpl<MyUserDao, MyUserEntity> impl
|
||||
return pageRes;
|
||||
}
|
||||
|
||||
@Override
|
||||
public R activateVIP(UserVipLog vipLog) {
|
||||
MyUserEntity user = userDao.selectOne(new LambdaQueryWrapper<MyUserEntity>().eq(MyUserEntity::getId,vipLog.getUserId()));
|
||||
if ("2".equals(user.getVip())){
|
||||
if (vipLog.getType()==3) {
|
||||
return R.error("当前为医学vip,只能升级成超级vip");
|
||||
}
|
||||
}
|
||||
if ("3".equals(user.getVip())){
|
||||
if (vipLog.getType()==2) {
|
||||
return R.error("当前为国学vip,只能升级成超级vip");
|
||||
}
|
||||
}
|
||||
if (user.getPeanutCoin().compareTo(vipLog.getPoint())<0){
|
||||
return R.error("虚拟币不足");
|
||||
}
|
||||
if (user.getJf().compareTo(vipLog.getJf())<0){
|
||||
return R.error("积分不足");
|
||||
}
|
||||
//先将原VIP失效
|
||||
List<UserVip> userVip = userVipDao.selectList(new LambdaQueryWrapper<UserVip>().eq(UserVip::getUserId,vipLog.getUserId()).eq(UserVip::getState,0));
|
||||
if (userVip.size()>0){
|
||||
for (UserVip u : userVip) {
|
||||
u.setState(1);;
|
||||
userVipDao.updateById(u);
|
||||
}
|
||||
}
|
||||
//添加生成VIP记录
|
||||
vipLog.setAdminId(Integer.parseInt(ShiroUtils.getUserId().toString()));
|
||||
userVipLogDao.insert(vipLog);
|
||||
//扣除虚拟币和积分
|
||||
user.setPeanutCoin(user.getPeanutCoin().subtract(vipLog.getPoint()));
|
||||
user.setJf(user.getJf().subtract(vipLog.getJf()));
|
||||
userDao.updateById(user);
|
||||
//新建用户vip
|
||||
UserVip newUserVip = new UserVip();
|
||||
newUserVip.setUserId(vipLog.getUserId());
|
||||
newUserVip.setType(vipLog.getType());
|
||||
newUserVip.setStartTime(vipLog.getCreateTime());
|
||||
newUserVip.setEndTime(DateUtils.addDays(newUserVip.getStartTime(),vipLog.getDays()));
|
||||
userVipDao.insert(newUserVip);
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user