rc-service/rc-inner-api/other-inner/other-inner-model/src/main/java/com/red/circle/other/inner/enums/material/ConsolePropsTypeEnum.java

@@ -64,20 +64,15 @@ public enum ConsolePropsTypeEnum {
    */
   FLOAT_PICTURE("FLOAT_PICTURE", "个人中心飘窗"),
 
-  /**
+  /**
-   * 资料卡.
+   * 资料卡.
-   */
+   */
-  DATA_CARD("DATA_CARD", "资料卡"),
+  DATA_CARD("DATA_CARD", "资料卡"),
-
+
-  /**
+  /**
-   * VIP动效图.
+   * 红包.
-   */
+   */
-  VIP_EFFECT_IMAGE("VIP_EFFECT_IMAGE", "VIP动效图"),
+  RED_PACKET("RED_PACKET", "红包封面");
-
-  /**
-   * 红包.
-   */
-  RED_PACKET("RED_PACKET", "红包封面");
 
   private final String desc;
   private final String name;

rc-service/rc-inner-api/other-inner/other-inner-model/src/main/java/com/red/circle/other/inner/enums/material/PropsCommodityType.java

@@ -57,20 +57,15 @@ public enum PropsCommodityType {
    */
   FLOAT_PICTURE,
 
-  /**
+  /**
-   * 资料卡.
+   * 资料卡.
-   */
+   */
-  DATA_CARD,
+  DATA_CARD,
-
+
-  /**
+  /**
-   * VIP动效图.
+   * 碎片.
-   */
+   */
-  VIP_EFFECT_IMAGE,
+  FRAGMENTS,
-
-  /**
-   * 碎片.
-   */
-  FRAGMENTS,
 
   /**
    * 红包封面.

rc-service/rc-inner-api/other-inner/other-inner-model/src/main/java/com/red/circle/other/inner/enums/material/PropsTypeEnum.java

@@ -61,19 +61,14 @@ public enum PropsTypeEnum {
    */
   FLOAT_PICTURE,
 
-  /**
+  /**
-   * 资料卡.
+   * 资料卡.
-   */
+   */
-  DATA_CARD,
+  DATA_CARD,
-
+
-  /**
+  /**
-   * VIP动效图.
+   * 红包封面.
-   */
+   */
-  VIP_EFFECT_IMAGE,
+  RED_PACKET
-
-  /**
-   * 红包封面.
-   */
-  RED_PACKET
 
 }

rc-service/rc-inner-api/other-inner/other-inner-model/src/main/java/com/red/circle/other/inner/enums/sys/SysBadgeConfigTypeEnum.java

@@ -8,17 +8,12 @@ import java.util.Objects;
  *
  * @author houyong on 2021/3/19
  */
-public enum SysBadgeConfigTypeEnum {
+public enum SysBadgeConfigTypeEnum {
-
+
-  /**
+  /**
-   * VIP.
+   * 成就.
-   */
+   */
-  VIP("VIP", "用户-VIP"),
+  ACHIEVEMENT("ACHIEVEMENT", "用户-成就"),
-
-  /**
-   * 成就.
-   */
-  ACHIEVEMENT("ACHIEVEMENT", "用户-成就"),
 
   /**
    * 管理员.

rc-service/rc-service-live/live-client/src/main/java/com/red/circle/live/app/dto/clientobject/LiveMicUserCO.java

@@ -1,10 +1,9 @@
 package com.red.circle.live.app.dto.clientobject;
 
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+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.OwnSpecialIdDTO;
-import com.red.circle.other.inner.model.dto.user.props.UserUseBadgeDTO;
+import com.red.circle.other.inner.model.dto.user.props.UserUsePropsDTO;
-import com.red.circle.other.inner.model.dto.user.props.UserUsePropsDTO;
 import java.io.Serial;
 import java.io.Serializable;
 import java.util.List;
@@ -60,39 +59,24 @@ 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;
 

rc-service/rc-service-live/live-domain/src/main/java/com/red/circle/live/domain/live/LiveMicUser.java

@@ -1,11 +1,10 @@
 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.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+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.OwnSpecialIdDTO;
-import com.red.circle.other.inner.model.dto.user.props.UserUseBadgeDTO;
+import com.red.circle.other.inner.model.dto.user.props.UserUsePropsDTO;
-import com.red.circle.other.inner.model.dto.user.props.UserUsePropsDTO;
 import java.io.Serial;
 import java.io.Serializable;
 import java.util.List;
@@ -62,35 +61,20 @@ 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;
 
   /**
    * 心动值