From b01f752252eaadd1fa31eda6a9ad43146660b721 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 03 四月 2025 23:42:57 +0800
Subject: [PATCH] bug修改
---
xinquan-api/xinquan-api-system/src/main/java/com/xinquan/system/api/domain/AppUser.java | 75 ++++++++++++++++++++++++++++++++++---
1 files changed, 68 insertions(+), 7 deletions(-)
diff --git a/xinquan-api/xinquan-api-system/src/main/java/com/xinquan/system/api/domain/AppUser.java b/xinquan-api/xinquan-api-system/src/main/java/com/xinquan/system/api/domain/AppUser.java
index 4d2021e..50e8da8 100644
--- a/xinquan-api/xinquan-api-system/src/main/java/com/xinquan/system/api/domain/AppUser.java
+++ b/xinquan-api/xinquan-api-system/src/main/java/com/xinquan/system/api/domain/AppUser.java
@@ -1,14 +1,14 @@
package com.xinquan.system.api.domain;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.xinquan.common.core.web.domain.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.math.BigDecimal;
import java.time.LocalDateTime;
+import java.util.List;
+
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -21,7 +21,6 @@
* @since 2024-08-21
*/
@Data
-@EqualsAndHashCode(callSuper = true)
@TableName("t_app_user")
@ApiModel(value="AppUser对象", description="用户信息表")
public class AppUser extends BaseModel {
@@ -35,6 +34,9 @@
@ApiModelProperty(value = "系统用户id")
@TableField("user_id")
private Long userId;
+ @ApiModelProperty(value = "uid")
+ @TableField(exist = false)
+ private String uid;
@ApiModelProperty(value = "手机号码")
@TableField("cell_phone")
@@ -55,14 +57,23 @@
@ApiModelProperty(value = "昵称")
@TableField("nickname")
private String nickname;
+ @ApiModelProperty(value = "姓名")
+ @TableField("realname")
+ private String realname;
@ApiModelProperty(value = "签名")
@TableField("signature")
private String signature;
+ @ApiModelProperty(value = "用户code YH202010106666")
+ @TableField("code")
+ private String code;
@ApiModelProperty(value = "性别 1=男 2=女 3=保密")
@TableField("gender")
private Integer gender;
+ @ApiModelProperty(value = "会员类型 1月度2季度3年度 ")
+ @TableField(value = "vip_level",updateStrategy = FieldStrategy.IGNORED)
+ private Integer vipLevel;
@ApiModelProperty(value = "生日")
@TableField("birthday")
@@ -80,7 +91,7 @@
@TableField("company")
private String company;
- @ApiModelProperty(value = "职业")
+ @ApiModelProperty(value = "职位")
@TableField("occupation")
private String occupation;
@@ -95,9 +106,15 @@
@ApiModelProperty(value = "邮箱")
@TableField("email")
private String email;
+ @ApiModelProperty(value = "微信名称")
+ @TableField("wxName")
+ private String wxName;
+ @ApiModelProperty(value = "设备码")
+ @TableField("device")
+ private String device;
@ApiModelProperty(value = "会员到期时间")
- @TableField("vip_expire_time")
+ @TableField(value = "vip_expire_time",updateStrategy = FieldStrategy.IGNORED)
private LocalDateTime vipExpireTime;
@ApiModelProperty(value = "用户状态 1=正常 2=冻结 3=注销")
@@ -111,6 +128,9 @@
@ApiModelProperty(value = "冻结操作人")
@TableField("freezing_operator")
private String freezingOperator;
+ @ApiModelProperty(value = "冻结时间")
+ @TableField("freezing_time")
+ private LocalDateTime freezingTime;
@ApiModelProperty(value = "梵文权限 1=是 2否")
@TableField("sanskrit_flag")
@@ -119,6 +139,9 @@
@ApiModelProperty(value = "邀请人id")
@TableField("invite_user_id")
private Long inviteUserId;
+ @ApiModelProperty(value = "绑定邀请人时间")
+ @TableField("invite_user_time")
+ private LocalDateTime inviteUserTime;
@ApiModelProperty(value = "余额")
@TableField("balance")
@@ -134,6 +157,7 @@
@ApiModelProperty(value = "注册时间")
@TableField("register_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime registerTime;
@ApiModelProperty(value = "注销时间")
@@ -150,16 +174,53 @@
@ApiModelProperty(value = "标签id，多个id使用英文逗号拼接")
@TableField("tag_id")
private String tagId;
+ @ApiModelProperty(value = "第三方分账接收方id 用于提现")
+ @TableField("fenzhangId")
+ private String fenzhangId;
+
+ @ApiModelProperty(value = "用户标签")
+ @TableField(exist = false)
+ private List<String> tags;
+
@ApiModelProperty(value = "是否弹窗心泉之树提示 1是2否")
@TableField("isFirst")
private Integer isFirst;
+
@ApiModelProperty(value = "当前剩余能量值")
@TableField("energy_value")
private Integer energyValue;
+
+ @ApiModelProperty(value = "邀请码")
+ @TableField("qrCode")
+ private String qrCode;
+
@ApiModelProperty(value = "帮助人数")
@TableField(exist = false)
private Integer count;
+
@ApiModelProperty(value = "佣金金额")
@TableField(exist = false)
private BigDecimal money;
+ @ApiModelProperty(value = "是否是会员 1是2否")
+ @TableField(exist = false)
+ private Integer isVip;
+ @ApiModelProperty(value = "疗愈等级")
+ @TableField(exist = false)
+ private Integer level;
+ @ApiModelProperty(value = "疗愈等级名称")
+ @TableField(exist = false)
+ private String levelName;
+ @ApiModelProperty(value = "疗愈等级图标")
+ @TableField(exist = false)
+ private String levelIcon;
+ @ApiModelProperty(value = "累计练习天数")
+ @TableField(exist = false)
+ private Integer cumulative;
+ @ApiModelProperty(value = "今日练习时长 单位分钟")
+ @TableField(exist = false)
+ private Integer today;
+ @ApiModelProperty(value = "连续练习天数")
+ @TableField(exist = false)
+ private Integer continuity;
+
}
--
Gitblit v1.7.1