Compare commits

...

2 Commits

Author SHA1 Message Date
hy001
f94fb80701 feat: add VIP resource enums 2026-05-16 02:21:43 +08:00
hy001
a1979f2be7 fix: include badge fields in live user list 2026-05-16 01:40:34 +08:00
6 changed files with 113 additions and 61 deletions

View File

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

View File

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

View File

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

View File

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

View File

@ -1,9 +1,10 @@
package com.red.circle.live.app.dto.clientobject; 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.UserUsePropsDTO; 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.Serial;
import java.io.Serializable; import java.io.Serializable;
import java.util.List; import java.util.List;
@ -59,24 +60,39 @@ public class LiveMicUserCO implements Serializable {
*/ */
private OwnSpecialIdDTO ownSpecialId; private OwnSpecialIdDTO ownSpecialId;
/** /**
* 使用的道具. * 使用的道具.
*/ */
private List<UserUsePropsDTO> useProps; private List<UserUsePropsDTO> useProps;
/**
* 佩戴的徽章.
*/
private List<UserUseBadgeDTO> wearBadge;
/**
* 佩戴的荣誉徽章.
*/
private List<UserUseBadgeDTO> wearHonor;
/** /**
* 角色. * 角色.
*/ */
private String roles; private String roles;
/** /**
* 魅力等级. * 魅力等级.
*/ */
private Integer charmLevel; private Integer charmLevel;
/**
/** * 财富等级.
* 心动值 */
private Integer wealthLevel;
/**
* 心动值
*/ */
private Long heartbeatVal; private Long heartbeatVal;

View File

@ -1,10 +1,11 @@
package com.red.circle.live.domain.live; package com.red.circle.live.domain.live;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties; 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.UserUsePropsDTO; 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.Serial;
import java.io.Serializable; import java.io.Serializable;
import java.util.List; import java.util.List;
@ -61,20 +62,35 @@ public class LiveMicUser implements Serializable {
*/ */
private OwnSpecialIdDTO ownSpecialId; private OwnSpecialIdDTO ownSpecialId;
/** /**
* 使用的道具. * 使用的道具.
*/ */
private List<UserUsePropsDTO> useProps; private List<UserUsePropsDTO> useProps;
/**
* 佩戴的徽章.
*/
private List<UserUseBadgeDTO> wearBadge;
/**
* 佩戴的荣誉徽章.
*/
private List<UserUseBadgeDTO> wearHonor;
/** /**
* 角色. * 角色.
*/ */
private String roles; private String roles;
/** /**
* 魅力等级. * 魅力等级.
*/ */
private Integer charmLevel; private Integer charmLevel;
/**
* 财富等级.
*/
private Integer wealthLevel;
/** /**
* 心动值 * 心动值