Compare commits

..

No commits in common. "f94fb807016e821e73dfec0c6776fc523f99ca47" and "3692e61b1c6c8fce54096df06d0021a0c8393ecb" have entirely different histories.

6 changed files with 61 additions and 113 deletions

View File

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

View File

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

View File

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

View File

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

View File

@ -1,10 +1,9 @@
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.UserUseBadgeDTO;
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.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<UserUseBadgeDTO> wearBadge;
/**
* 佩戴的荣誉徽章.
*/
private List<UserUseBadgeDTO> wearHonor;
/**
* 使用的道具.
*/
private List<UserUsePropsDTO> useProps;
/**
* 角色.
*/
private String roles;
/**
* 魅力等级.
*/
private Integer charmLevel;
/**
* 财富等级.
*/
private Integer wealthLevel;
/**
* 心动值
/**
* 魅力等级.
*/
private Integer charmLevel;
/**
* 心动值
*/
private Long heartbeatVal;

View File

@ -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.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 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 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<UserUseBadgeDTO> wearBadge;
/**
* 佩戴的荣誉徽章.
*/
private List<UserUseBadgeDTO> wearHonor;
/**
* 使用的道具.
*/
private List<UserUsePropsDTO> useProps;
/**
* 角色.
*/
private String roles;
/**
* 魅力等级.
*/
private Integer charmLevel;
/**
* 财富等级.
*/
private Integer wealthLevel;
/**
* 魅力等级.
*/
private Integer charmLevel;
/**
* 心动值