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

用户列表展示注册时间和迁移时间 并可排序

Browse Source
This commit is contained in:
wyn
2026-05-19 10:35:05 +08:00
parent 53d58c98cd
commit 3dbefdda6f
4 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/peanut/modules/common/controller/UserVipController.java
View File

@@ -201,6 +201,7 @@ public class UserVipController {
ll.add(Arrays.asList(9));
ll.add(Arrays.asList(5));
ll.add(Arrays.asList(6));
ll.add(Arrays.asList(10));
ll.add(Arrays.asList(2));
ll.add(Arrays.asList(7,8));
}
@@ -229,17 +230,20 @@ public class UserVipController {
List<UserVip> uv9 = userVipService.list(new LambdaQueryWrapper<UserVip>().eq(UserVip::getUserId,ShiroUtils.getUId()).eq(UserVip::getType,9).orderByDesc(UserVip::getEndTime));
List<UserVip> uv5 = userVipService.list(new LambdaQueryWrapper<UserVip>().eq(UserVip::getUserId,ShiroUtils.getUId()).eq(UserVip::getType,5).orderByDesc(UserVip::getEndTime));
List<UserVip> uv6 = userVipService.list(new LambdaQueryWrapper<UserVip>().eq(UserVip::getUserId,ShiroUtils.getUId()).eq(UserVip::getType,6).orderByDesc(UserVip::getEndTime));
if (uv4.size() > 0 && uv9.size() > 0 && uv5.size() > 0 && uv6.size() > 0){//办理过
List<UserVip> uv10 = userVipService.list(new LambdaQueryWrapper<UserVip>().eq(UserVip::getUserId,ShiroUtils.getUId()).eq(UserVip::getType,10).orderByDesc(UserVip::getEndTime));
if (uv4.size() > 0 && uv9.size() > 0 && uv5.size() > 0 && uv6.size() > 0&& uv10.size() > 0){//办理过
if (uv4.get(0).getState()==0&&uv9.get(0).getState()==0&&uv5.get(0).getState()==0&&uv6.get(0).getState()==0){
long l4 = uv4.get(0).getEndTime().getTime();
long l9 = uv9.get(0).getEndTime().getTime();
long l5 = uv5.get(0).getEndTime().getTime();
long l6 = uv6.get(0).getEndTime().getTime();
long l10 = uv10.get(0).getEndTime().getTime();
List<Long> tempList = new ArrayList();
tempList.add(l4);
tempList.add(l9);
tempList.add(l5);
tempList.add(l6);
tempList.add(l10);
tempList = tempList.stream().sorted((long1,long2)->{
return Long.compare(long1,long2);
}).collect(Collectors.toList());
@@ -311,6 +315,7 @@ public class UserVipController {
ll.add(Arrays.asList(9));
ll.add(Arrays.asList(5));
ll.add(Arrays.asList(6));
ll.add(Arrays.asList(10));
ll.add(Arrays.asList(2));
ll.add(Arrays.asList(7,8));
List<Map<String,Object>> resList = new ArrayList<>();
@@ -468,7 +473,7 @@ public class UserVipController {
Map map = new HashMap();
map.put("courseCount",0);
map.put("originalPrice",0);
if ("4".equals(type)||"9".equals(type)||"5".equals(type)||"6".equals(type)){
if ("4".equals(type)||"9".equals(type)||"5".equals(type)||"6".equals(type)||"10".equals(type)){
List list = new ArrayList<>();
if ("4".equals(type)){
userVipService.bottomLabel(1,list);
@@ -478,6 +483,8 @@ public class UserVipController {
userVipService.bottomLabel(2,list);
}else if ("6".equals(type)){
userVipService.bottomLabel(5,list);
}else if ("10".equals(type)){
userVipService.bottomLabel(109,list);
}
if (list.size()>0){
MPJLambdaWrapper<CourseCatalogueEntity> wrapper = new MPJLambdaWrapper();