diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java index 6f2510ab6f..9fe158c415 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java @@ -254,24 +254,9 @@ public class UserBadgeServiceImpl implements UserBadgeService { @Override public void reloadCustomerBadge(String customerId){ userBadgeRedis.delCustomerBadge(customerId); - List resultUserBadge = new ArrayList<>(); List userBadgeListResultDTOS = userBadgeDao.selectAllBadge(customerId); - if (!CollectionUtils.isEmpty(userBadgeListResultDTOS)){ - Map> groupByCustomer = userBadgeListResultDTOS.stream().collect(Collectors.groupingBy(UserBadgeListResultDTO::getCustomerId)); - resultUserBadge.addAll(groupByCustomer.get(BadgeConstant.DEFAULT_CUSTOMER)); - List badgeByCustomer = groupByCustomer.get(customerId); - if (!CollectionUtils.isEmpty(badgeByCustomer)) { - resultUserBadge.forEach(r -> { - for (int i = NumConstant.ZERO; i < badgeByCustomer.size(); i++) { - if (r.getBadgeId().equals(badgeByCustomer.get(i).getBadgeId())) { - BeanUtils.copyProperties(badgeByCustomer.get(i), r); - badgeByCustomer.remove(badgeByCustomer.get(i)); - } - } - }); - resultUserBadge.addAll(badgeByCustomer); - } - userBadgeRedis.setCustomerBadge(resultUserBadge, customerId); + if (CollectionUtils.isEmpty(userBadgeListResultDTOS)){ + throw new RenException("客户徽章缓存初始化未查到数据"); } userBadgeRedis.setCustomerBadge(userBadgeListResultDTOS, customerId); }