From 6110d4a93483a1cbcd697ffb7df65162a347b17f Mon Sep 17 00:00:00 2001
From: tianfeng <769204422@qq.com>
Date: Wed, 4 Feb 2026 11:23:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E6=80=81=E7=94=A8=E6=88=B7vip?=
 =?UTF-8?q?=E5=92=8C=E5=BE=BD=E7=AB=A0=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inner/model/dto/user/UserSimpleProfileDTO.java   |  6 ++++--
 .../app/convertor/user/UserProfileAppConvertor.java  | 12 +-----------
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/rc-service/rc-inner-api/other-inner/other-inner-model/src/main/java/com/red/circle/other/inner/model/dto/user/UserSimpleProfileDTO.java b/rc-service/rc-inner-api/other-inner/other-inner-model/src/main/java/com/red/circle/other/inner/model/dto/user/UserSimpleProfileDTO.java
index 53140314..798d15ea 100644
--- a/rc-service/rc-inner-api/other-inner/other-inner-model/src/main/java/com/red/circle/other/inner/model/dto/user/UserSimpleProfileDTO.java
+++ b/rc-service/rc-inner-api/other-inner/other-inner-model/src/main/java/com/red/circle/other/inner/model/dto/user/UserSimpleProfileDTO.java
@@ -5,6 +5,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import java.io.Serial;
 import java.io.Serializable;
 import java.util.List;
+
+import com.red.circle.other.inner.model.dto.user.props.UserUsePropsDTO;
 import lombok.Data;
 
 /**
@@ -53,9 +55,9 @@ public class UserSimpleProfileDTO implements Serializable {
   private OwnSpecialIdDTO ownSpecialId;
 
   /**
-   * 使用的道具（仅包含贵族VIP类型）.
+   * 使用的道具.
    */
-  private List<SimplePropsDTO> useProps;
+  private List<UserUsePropsDTO> useProps;
 
   /**
    * 佩戴的勋章.
diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/convertor/user/UserProfileAppConvertor.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/convertor/user/UserProfileAppConvertor.java
index 6d02717b..38efd202 100644
--- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/convertor/user/UserProfileAppConvertor.java
+++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/convertor/user/UserProfileAppConvertor.java
@@ -105,17 +105,6 @@ public interface UserProfileAppConvertor {
           dto.getUseProps().stream()
               .filter(props -> props.getPropsResources() != null 
                   && "NOBLE_VIP".equals(props.getPropsResources().getType()))
-              .map(props -> {
-                UserSimpleProfileDTO.SimplePropsDTO simpleProps =
-                    new UserSimpleProfileDTO.SimplePropsDTO();
-                simpleProps.setType(props.getPropsResources().getType());
-                simpleProps.setName(props.getPropsResources().getName());
-                simpleProps.setCover(props.getPropsResources().getCover());
-                simpleProps.setSourceUrl(props.getPropsResources().getSourceUrl());
-                simpleProps.setExpand(props.getPropsResources().getExpand());
-                simpleProps.setExpireTime(props.getExpireTime());
-                return simpleProps;
-              })
               .collect(Collectors.toList())
       );
     }
@@ -124,6 +113,7 @@ public interface UserProfileAppConvertor {
     if (dto.getWearBadge() != null) {
       simple.setWearBadge(
           dto.getWearBadge().stream()
+              .filter( e -> Boolean.TRUE.equals(e.getUse()))
               .map(badge -> {
                 UserSimpleProfileDTO.SimpleBadgeDTO simpleBadge =
                     new UserSimpleProfileDTO.SimpleBadgeDTO();