From 5dadceac20577829e4c57f37e2b43f644e1dad9b Mon Sep 17 00:00:00 2001 From: wuchunlei Date: Thu, 6 Mar 2025 14:14:37 +0800 Subject: [PATCH] =?UTF-8?q?vip=E5=95=86=E5=93=81=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../peanut/modules/common/controller/UserVipController.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/peanut/modules/common/controller/UserVipController.java b/src/main/java/com/peanut/modules/common/controller/UserVipController.java index e2776961..639b276e 100644 --- a/src/main/java/com/peanut/modules/common/controller/UserVipController.java +++ b/src/main/java/com/peanut/modules/common/controller/UserVipController.java @@ -192,6 +192,9 @@ public class UserVipController { 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.in(VipBuyConfigEntity::getType,l); + if ("psyche".equals(appType)){ + wrapper.orderByDesc(VipBuyConfigEntity::getType); + } wrapper.groupBy(VipBuyConfigEntity::getType); List> list = vipBuyConfigService.listMaps(wrapper); for (Map 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"))); }).collect(Collectors.toList()); 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"))? - 1:((map1.get("vcbList")==null?0:(int)map1.get("type"))==(map2.get("vcbList")==null?0:(int)map2.get("type"))?0:-1); + 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()))); }).collect(Collectors.toList()); resList.addAll(list); }