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-03-06 14:14:37 +08:00
parent 1fcde7e350
commit 5dadceac20
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -192,6 +192,9 @@ public class UserVipController {
wrapper.select(VipBuyConfigEntity::getType,VipBuyConfigEntity::getTitle); wrapper.select(VipBuyConfigEntity::getType,VipBuyConfigEntity::getTitle);
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()))); 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())));
wrapper.in(VipBuyConfigEntity::getType,l); wrapper.in(VipBuyConfigEntity::getType,l);
if ("psyche".equals(appType)){
wrapper.orderByDesc(VipBuyConfigEntity::getType);
}
wrapper.groupBy(VipBuyConfigEntity::getType); wrapper.groupBy(VipBuyConfigEntity::getType);
List<Map<String,Object>> list = vipBuyConfigService.listMaps(wrapper); List<Map<String,Object>> list = vipBuyConfigService.listMaps(wrapper);
for (Map<String,Object> map:list){ for (Map<String,Object> map:list){
@@ -276,8 +279,7 @@ public class UserVipController {
return Long.compare((Long) (map1.get("tip")==null?0l:map1.get("tip")),(Long)(map2.get("tip")==null?0l:map2.get("tip"))); return Long.compare((Long) (map1.get("tip")==null?0l:map1.get("tip")),(Long)(map2.get("tip")==null?0l:map2.get("tip")));
}).collect(Collectors.toList()); }).collect(Collectors.toList());
list = list.stream().sorted((map1,map2)->{ list = list.stream().sorted((map1,map2)->{
return (map1.get("vcbList")==null?0:(int)map1.get("type"))>(map2.get("vcbList")==null?0:(int)map2.get("type"))? return Long.compare((Long) (map1.get("vcbList")==null?0l:Long.parseLong(map1.get("type").toString())),(Long)(map2.get("vcbList")==null?0l:Long.parseLong(map2.get("type").toString())));
1:((map1.get("vcbList")==null?0:(int)map1.get("type"))==(map2.get("vcbList")==null?0:(int)map2.get("type"))?0:-1);
}).collect(Collectors.toList()); }).collect(Collectors.toList());
resList.addAll(list); resList.addAll(list);
} }