From a1979f2be7e88962bbea44d0bb4165edb6d53514 Mon Sep 17 00:00:00 2001
From: hy001 <hy@hy001deMacBook-Pro.local>
Date: Sat, 16 May 2026 01:40:34 +0800
Subject: [PATCH] fix: include badge fields in live user list

---
 .../app/dto/clientobject/LiveMicUserCO.java   | 48 ++++++++++++-------
 .../circle/live/domain/live/LiveMicUser.java  | 40 +++++++++++-----
 2 files changed, 60 insertions(+), 28 deletions(-)

diff --git a/rc-service/rc-service-live/live-client/src/main/java/com/red/circle/live/app/dto/clientobject/LiveMicUserCO.java b/rc-service/rc-service-live/live-client/src/main/java/com/red/circle/live/app/dto/clientobject/LiveMicUserCO.java
index 561283b0..f5d7b178 100644
--- a/rc-service/rc-service-live/live-client/src/main/java/com/red/circle/live/app/dto/clientobject/LiveMicUserCO.java
+++ b/rc-service/rc-service-live/live-client/src/main/java/com/red/circle/live/app/dto/clientobject/LiveMicUserCO.java
@@ -1,9 +1,10 @@
 package com.red.circle.live.app.dto.clientobject;
 
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.red.circle.other.inner.model.dto.user.OwnSpecialIdDTO;
-import com.red.circle.other.inner.model.dto.user.props.UserUsePropsDTO;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.red.circle.other.inner.model.dto.user.OwnSpecialIdDTO;
+import com.red.circle.other.inner.model.dto.user.props.UserUseBadgeDTO;
+import com.red.circle.other.inner.model.dto.user.props.UserUsePropsDTO;
 import java.io.Serial;
 import java.io.Serializable;
 import java.util.List;
@@ -59,24 +60,39 @@ public class LiveMicUserCO implements Serializable {
    */
   private OwnSpecialIdDTO ownSpecialId;
 
-  /**
-   * 使用的道具.
-   */
-  private List<UserUsePropsDTO> useProps;
+  /**
+   * 使用的道具.
+   */
+  private List<UserUsePropsDTO> useProps;
+
+  /**
+   * 佩戴的徽章.
+   */
+  private List<UserUseBadgeDTO> wearBadge;
+
+  /**
+   * 佩戴的荣誉徽章.
+   */
+  private List<UserUseBadgeDTO> wearHonor;
 
   /**
    * 角色.
    */
   private String roles;
 
-  /**
-   * 魅力等级.
-   */
-  private Integer charmLevel;
-
-
-  /**
-   * 心动值
+  /**
+   * 魅力等级.
+   */
+  private Integer charmLevel;
+
+  /**
+   * 财富等级.
+   */
+  private Integer wealthLevel;
+
+
+  /**
+   * 心动值
    */
   private Long heartbeatVal;
 
diff --git a/rc-service/rc-service-live/live-domain/src/main/java/com/red/circle/live/domain/live/LiveMicUser.java b/rc-service/rc-service-live/live-domain/src/main/java/com/red/circle/live/domain/live/LiveMicUser.java
index 993cd640..4961a7ba 100644
--- a/rc-service/rc-service-live/live-domain/src/main/java/com/red/circle/live/domain/live/LiveMicUser.java
+++ b/rc-service/rc-service-live/live-domain/src/main/java/com/red/circle/live/domain/live/LiveMicUser.java
@@ -1,10 +1,11 @@
 package com.red.circle.live.domain.live;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.red.circle.other.inner.model.dto.user.OwnSpecialIdDTO;
-import com.red.circle.other.inner.model.dto.user.props.UserUsePropsDTO;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.red.circle.other.inner.model.dto.user.OwnSpecialIdDTO;
+import com.red.circle.other.inner.model.dto.user.props.UserUseBadgeDTO;
+import com.red.circle.other.inner.model.dto.user.props.UserUsePropsDTO;
 import java.io.Serial;
 import java.io.Serializable;
 import java.util.List;
@@ -61,20 +62,35 @@ public class LiveMicUser implements Serializable {
    */
   private OwnSpecialIdDTO ownSpecialId;
 
-  /**
-   * 使用的道具.
-   */
-  private List<UserUsePropsDTO> useProps;
+  /**
+   * 使用的道具.
+   */
+  private List<UserUsePropsDTO> useProps;
+
+  /**
+   * 佩戴的徽章.
+   */
+  private List<UserUseBadgeDTO> wearBadge;
+
+  /**
+   * 佩戴的荣誉徽章.
+   */
+  private List<UserUseBadgeDTO> wearHonor;
 
   /**
    * 角色.
    */
   private String roles;
 
-  /**
-   * 魅力等级.
-   */
-  private Integer charmLevel;
+  /**
+   * 魅力等级.
+   */
+  private Integer charmLevel;
+
+  /**
+   * 财富等级.
+   */
+  private Integer wealthLevel;
 
   /**
    * 心动值