From 83751617ac342e4168cb714106bc009e3f25f99c Mon Sep 17 00:00:00 2001 From: phpcjl <phpcjl@gmail.com> Date: 星期三, 18 十二月 2024 09:32:02 +0800 Subject: [PATCH] 1 --- ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 43 insertions(+), 0 deletions(-) diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java index c251413..5479c1b 100644 --- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java +++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -13,6 +14,7 @@ import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.List; +import java.util.Set; /** * <p> @@ -40,6 +42,9 @@ @ApiModelProperty(value = "用户") @TableField("name") private String name; + @ApiModelProperty("会员名称") + @TableField(exist = false) + private String vipName; @ApiModelProperty(value = "手机号") @TableField("phone") @@ -67,6 +72,7 @@ @ApiModelProperty(value = "添加时间") @TableField("create_time") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; @ApiModelProperty(value = "删除(0=否,1=是)") @@ -101,6 +107,9 @@ @ApiModelProperty(value = "绑定门店名称") @TableField(exist = false) private String shopName; + @ApiModelProperty(value = "绑定门店列表") + @TableField(exist = false) + private List<String> shopNames; @ApiModelProperty(value = "绑定门店封面") @TableField(exist = false) private String shopCover; @@ -161,6 +170,22 @@ @ApiModelProperty(value = "分销总金额") @TableField("total_distribution_amount") private BigDecimal totalDistributionAmount; + + @ApiModelProperty(value = "拉新人积分总数") + @TableField("total_invite_point") + private Integer totalInvitePoint; + + @ApiModelProperty(value = "注册积分总数") + @TableField("total_register_point") + private Integer totalRegisterPoint; + + @ApiModelProperty(value = "做工积分总数") + @TableField("total_work_point") + private Integer totalWorkPoint; + + @ApiModelProperty(value = "业绩积分总数") + @TableField("total_performance_point") + private Integer totalPerformancePoint; @ApiModelProperty(value = "剩余积分") @@ -242,6 +267,24 @@ @TableField(exist = false) private Integer isSign; + @ApiModelProperty("绑定门店id列表") + @TableField(exist = false) + private Set<Integer> shopIds; + + @ApiModelProperty(value = "降级预警") + @TableField("is_danger") + private Integer isDanger; + + @ApiModelProperty(value = "最后下单时间") + @TableField(exist = false) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime lastOrderTime; + + + public String getIdStr(){ + return String.valueOf(id); + } + -- Gitblit v1.7.1