zm/nuttyreading-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

VIP改版

Browse Source
This commit is contained in:
wuchunlei
2025-02-21 15:47:50 +08:00
parent 0e8b4d2e0e
commit 6908c092a5
38 changed files with 973 additions and 1797 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/peanut/modules/master/controller/UserManageController.java
View File

@@ -11,7 +11,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
import java.util.Map;
@@ -79,12 +78,6 @@ public class UserManageController {
return R.ok().put("result",page);
}
//获取vip历史开通记录
@RequestMapping("/activateVIP")
public R activateVIP(@RequestBody UserVipLog vipLog) {
return userService.activateVIP(vipLog);
}

76
src/main/java/com/peanut/modules/master/controller/UserVipController.java
View File

@@ -1,17 +1,13 @@
package com.peanut.modules.master.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.peanut.common.utils.DateUtils;
import com.peanut.common.utils.R;
import com.peanut.common.utils.ShiroUtils;
import com.peanut.modules.common.entity.MyUserEntity;
import com.peanut.modules.common.entity.UserVip;
import com.peanut.modules.common.entity.VipBuyConfigEntity;
import com.peanut.modules.master.service.MyUserService;
import com.peanut.modules.master.service.UserVipService;
import com.peanut.modules.sociology.service.VipBuyConfigService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -21,8 +17,6 @@ import org.springframework.web.bind.annotation.RestController;
import javax.transaction.Transactional;
import java.math.BigDecimal;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
/**
* 超V管理
@@ -36,76 +30,6 @@ public class UserVipController {
private UserVipService vipService;
@Autowired
private MyUserService userService;
@Autowired
private VipBuyConfigService vipBuyConfigService;
//获取vip商品
@RequestMapping("/getVipProductForUser")
public R getVipProductForUser(@RequestBody Map<String, Object> params){
int uid = Integer.parseInt(params.get("uid").toString());
MyUserEntity userEntity = userService.getById(uid);
Integer chaoCount = vipService.count(new LambdaQueryWrapper<UserVip>().eq(UserVip::getUserId, uid).eq(UserVip::getType, 1).gt(UserVip::getEndTime,new Date()).eq(UserVip::getState,0));
Integer medicalCount = vipService.count(new LambdaQueryWrapper<UserVip>().eq(UserVip::getUserId, uid).eq(UserVip::getType, 2).gt(UserVip::getEndTime, new Date()).eq(UserVip::getState, 0));
Integer sociologyCount = vipService.count(new LambdaQueryWrapper<UserVip>().eq(UserVip::getUserId, uid).eq(UserVip::getType, 3).gt(UserVip::getEndTime, new Date()).eq(UserVip::getState, 0));
//获取超v列表
LambdaQueryWrapper<VipBuyConfigEntity> wrapper = new LambdaQueryWrapper<>();
wrapper.in(VipBuyConfigEntity::getType,userEntity.getVip().equals("1")||userEntity.getVip().equals("2")||userEntity.getVip().equals("3")? Collections.singletonList(1): Arrays.asList(1,2,3));
wrapper.and(r->r.eq(VipBuyConfigEntity::getDateType,0).or(f->f.eq(VipBuyConfigEntity::getDateType,1).lt(VipBuyConfigEntity::getStartTime,new Date()).gt(VipBuyConfigEntity::getEndTime,new Date())));
List<VipBuyConfigEntity> vipBuyConfigEntities = vipBuyConfigService.list(wrapper);
for (VipBuyConfigEntity v:vipBuyConfigEntities){
if(v.getType()==1){
if(userEntity.getVip().equals("0")){
v.setLastFee(chaoCount==0?v.getFee():v.getRebateFee());
} else {
if(userEntity.getVip().equals("2")){//医学转超v计算价格
List<UserVip> userVips = vipService.list(new LambdaQueryWrapper<UserVip>().eq(UserVip::getUserId, uid).eq(UserVip::getType, 2).gt(UserVip::getEndTime, new Date()).eq(UserVip::getState, 0));
if(userVips.size()!=1){
return R.error("用户vip信息异常，请联系管理员");
}
UserVip userVip = userVips.get(0);
Date nowDate = new Date(); // 第一个日期
Date endDate = userVip.getEndTime(); // 第二个日期
long differenceInMilliseconds = endDate.getTime() - nowDate.getTime();
int differenceInDays = (int) TimeUnit.MILLISECONDS.toDays(differenceInMilliseconds);
int i = (18000 / (3 * 365)) * differenceInDays;//默认按照打折价格抵扣
BigDecimal chaFee = BigDecimal.valueOf(i);
v.setLastFee(chaoCount>0?v.getRebateFee().subtract(chaFee):v.getFee().subtract(chaFee));
} else if (userEntity.getVip().equals("3")) {//国学vip转超v计算价格
List<UserVip> userVips = vipService.list(new LambdaQueryWrapper<UserVip>().eq(UserVip::getUserId, uid).eq(UserVip::getType, 3).gt(UserVip::getEndTime, new Date()).eq(UserVip::getState, 0));
if(userVips.size()!=1){
return R.error("用户vip信息异常，请联系管理员");
}
UserVip userVip = userVips.get(0);
Date nowDate = new Date(); // 第一个日期
Date endDate = userVip.getEndTime(); // 第二个日期
long differenceInMilliseconds = endDate.getTime() - nowDate.getTime();
int differenceInDays = (int)TimeUnit.MILLISECONDS.toDays(differenceInMilliseconds);
int i = (8888 / (3 * 365)) * differenceInDays;//默认按照打折价格抵扣
BigDecimal chaFee = BigDecimal.valueOf(i);
v.setLastFee(chaoCount>0?v.getRebateFee().subtract(chaFee):v.getFee().subtract(chaFee));
}else {
v.setLastFee(v.getRebateFee());
}
}
}else {
v.setLastFee(chaoCount>0||medicalCount>0||sociologyCount>0?v.getRebateFee():v.getFee());
}
}
Map<String, List<VipBuyConfigEntity>> flag = new HashMap<>();
List<VipBuyConfigEntity> collect = vipBuyConfigEntities.stream().filter(r -> r.getType() == 1 &&r.getDateType()==0).collect(Collectors.toList());
List<VipBuyConfigEntity> collect2 = vipBuyConfigEntities.stream().filter(r -> r.getType() == 1 && r.getDateType() == 1).collect(Collectors.toList());
List<VipBuyConfigEntity> collect4 = vipBuyConfigEntities.stream().filter(r -> r.getType() == 2 && r.getDateType()==0).collect(Collectors.toList());
List<VipBuyConfigEntity> collect5 = vipBuyConfigEntities.stream().filter(r -> r.getType() == 2 && r.getDateType() == 1).collect(Collectors.toList());
List<VipBuyConfigEntity> collect1 = vipBuyConfigEntities.stream().filter(r -> r.getType() == 3 && r.getDateType()==0).collect(Collectors.toList());
List<VipBuyConfigEntity> collect3 = vipBuyConfigEntities.stream().filter(r -> r.getType() == 3 && r.getDateType() == 1).collect(Collectors.toList());
flag.put("super",collect);
flag.put("super_hd",collect2);
flag.put("sociology",collect1);
flag.put("sociology_hd",collect3);
flag.put("medical",collect4);
flag.put("medical_hd",collect5);
return R.ok().put("list",flag);
}
@RequestMapping("/listByPage")
public R listByPage(@RequestBody Map<String, Object> params) {

4
src/main/java/com/peanut/modules/master/service/MyUserService.java
View File

@@ -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);
}

23
src/main/java/com/peanut/modules/master/service/impl/CourseCatalogueChapterVideoServiceImpl.java
View File

@@ -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;
}

53
src/main/java/com/peanut/modules/master/service/impl/MyUserServiceImpl.java
View File

@@ -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();
}
}