From 56bf486adfbd573801413b052d0797363b50c82b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=BF=97=E6=81=92?= <842328916@qq.com> Date: Sat, 27 Sep 2025 22:00:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B9=B8=E8=BF=9024-=E5=90=8E=E5=8F=B0-?= =?UTF-8?q?=E5=85=B3=E6=B3=A8=E7=94=A8=E6=88=B7=E4=B8=AA=E4=BA=BA=E6=95=B0?= =?UTF-8?q?=E6=8D=AE-=E5=90=8E=E5=8F=B0=E5=85=B3=E6=B3=A8=E7=94=A8?= =?UTF-8?q?=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/vo/Lucky24ConfigAdminVo.java | 3 +++ .../service/lucky/Lucky24PoolAdminService.java | 17 +++++++++++++++++ .../lucky/Lucky24RecordAdminService.java | 4 ++-- .../business/dto/lucky/Lucky24GiftConfig.java | 2 ++ 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/Lucky24ConfigAdminVo.java b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/Lucky24ConfigAdminVo.java index a0ca57035..460cbda64 100644 --- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/Lucky24ConfigAdminVo.java +++ b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/Lucky24ConfigAdminVo.java @@ -31,6 +31,9 @@ public class Lucky24ConfigAdminVo { @ApiModelProperty("白名单用户id对比值N对应表") private Map whiteErbanNoProductionRatioMap; + @ApiModelProperty("后台关注用户id列表") + private List adminFollowErbanNoList; + @ApiModelProperty("") private Long preJudgeValue_H; @ApiModelProperty("") diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/lucky/Lucky24PoolAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/lucky/Lucky24PoolAdminService.java index f767553bb..5e203945e 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/lucky/Lucky24PoolAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/lucky/Lucky24PoolAdminService.java @@ -118,6 +118,9 @@ public class Lucky24PoolAdminService { Map blackUserMap = usersService.getUsersMapByUids(config.getBlackUidList()); vo.setBlackErbanNoList(blackUserMap.values().stream().map(Users::getErbanNo).collect(Collectors.toList())); + Map adminFollowUserMap = usersService.getUsersMapByUids(config.getAdminFollowUidList()); + vo.setAdminFollowErbanNoList(adminFollowUserMap.values().stream().map(Users::getErbanNo).collect(Collectors.toList())); + Map erbanNoProductionRatioMap = new HashMap<>(); Map whiteUserMap = usersService.getUsersMapByUids(new ArrayList<>(config.getWhiteUidProductionRatioMap().keySet())); for (Long uid: whiteUserMap.keySet()){ @@ -176,6 +179,20 @@ public class Lucky24PoolAdminService { config.setBlackUidList(uidList); } } + if (null != vo.getAdminFollowErbanNoList()){ + if (CollectionUtils.isEmpty(vo.getAdminFollowErbanNoList())){ + config.setAdminFollowUidList(Collections.emptyList()); + } else { + List uidList = vo.getAdminFollowErbanNoList().stream().map(erbanNo->{ + Users u = usersService.getUserByErbanNo(erbanNo); + if (null != u){ + return u.getUid(); + } + return null; + }).filter(Objects::nonNull).distinct().collect(Collectors.toList()); + config.setAdminFollowUidList(uidList); + } + } if (null != vo.getWhiteErbanNoProductionRatioMap()){ if (CollectionUtils.isEmpty(vo.getWhiteErbanNoProductionRatioMap())){ config.setWhiteUidProductionRatioMap(Collections.emptyMap()); diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/lucky/Lucky24RecordAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/lucky/Lucky24RecordAdminService.java index 075de67e1..852e8e20e 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/lucky/Lucky24RecordAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/lucky/Lucky24RecordAdminService.java @@ -364,12 +364,12 @@ public class Lucky24RecordAdminService { String sortCol, String sortOrder, int pageNo, int pageSize) { Lucky24GiftConfig config = lucky24GiftSendService.getConfig(); - List followUidList= config.getFollowUidList(); + List followUidList = config.getAdminFollowUidList(); if (CollectionUtils.isEmpty(followUidList)){ return new Lucky24PersonalStatVo(new PageResult<>(new Page<>(pageNo, pageSize))); } - List uidList = config.getFollowUidList().stream().sorted().toList(); + List uidList = followUidList.stream().sorted().toList(); return getPersonal(partitionId, uidList, null, date, userRechargeLevel, poolType, sortCol, sortOrder, pageNo, pageSize); } diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/lucky/Lucky24GiftConfig.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/lucky/Lucky24GiftConfig.java index c378fb701..339b047d3 100644 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/lucky/Lucky24GiftConfig.java +++ b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/lucky/Lucky24GiftConfig.java @@ -49,6 +49,8 @@ public class Lucky24GiftConfig { private Map whiteUidProductionRatioMap; private List blackUidList; + private List adminFollowUidList; + private String diamondIcon; public Lucky24GiftConfig getRatioByPartitionId(Integer partitionId){