Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java

@@ -88,20 +88,12 @@ public class UserBadgeServiceImpl implements UserBadgeService {
             userBadgeListResultDTOS.forEach(badge -> {
                 if (u.getBadgeId().equals(badge.getBadgeId())){
                     badge.setBadgeIcon(u.getBadgeIcon());
+                    u.setUpdatedTime(badge.getUpdatedTime());
                     u.setStatus(true);
                 }
             });
         });
-        List<UserBadgeListResultDTO> noOpenBadge = new ArrayList<>();
+        return redisUserBadgeList.stream().sorted(Comparator.comparing(UserBadgeListResultDTO::getStatus,Comparator.reverseOrder()).thenComparing(UserBadgeListResultDTO::getUpdatedTime,Comparator.reverseOrder()).thenComparing(UserBadgeListResultDTO::getSort)).collect(Collectors.toList());
-        redisUserBadgeList.forEach(u -> {
-            if (!u.getStatus()){
-                noOpenBadge.add(u);
-            }
-        });
-        if (!CollectionUtils.isEmpty(noOpenBadge)){
-            userBadgeListResultDTOS.addAll(noOpenBadge);
-        }
-        return userBadgeListResultDTOS.stream().sorted(Comparator.comparing(UserBadgeListResultDTO::getIsOpened,Comparator.reverseOrder()).thenComparing(UserBadgeListResultDTO::getUpdatedTime,Comparator.reverseOrder()).thenComparing(UserBadgeListResultDTO::getSort)).collect(Collectors.toList());
     }
 
     /**