From a8d2cb07f6440dc54dc4005b0b06d5a47cb1517d Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 16 十二月 2024 13:34:03 +0800
Subject: [PATCH] 12.16
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java | 80 +++++++++++++++++++++++++++++++++++----
1 files changed, 71 insertions(+), 9 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 61b90fb..a7914ca 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;
@@ -12,6 +13,8 @@
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Set;
/**
* <p>
@@ -33,9 +36,15 @@
@TableId("id")
private Long id;
+ @ApiModelProperty(value = "用户类型（1-普通用户，2-门店员工）")
+ private Integer userType;
+
@ApiModelProperty(value = "用户")
@TableField("name")
private String name;
+ @ApiModelProperty("会员名称")
+ @TableField(exist = false)
+ private String vipName;
@ApiModelProperty(value = "手机号")
@TableField("phone")
@@ -63,6 +72,7 @@
@ApiModelProperty(value = "添加时间")
@TableField("create_time")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private LocalDateTime createTime;
@ApiModelProperty(value = "删除（0=否，1=是）")
@@ -89,9 +99,7 @@
@TableField(exist = false)
private String inviteUserName;
- @ApiModelProperty(value = "当前用户顶级的推广人id")
- @TableField("top_invite_id")
- private Long topInviteId;
+
@ApiModelProperty(value = "绑定门店id")
@TableField("shop_id")
@@ -99,22 +107,37 @@
@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;
+ @ApiModelProperty(value = "绑定门店地址")
+ @TableField(exist = false)
+ private String shopAddress;
+ @ApiModelProperty(value = "上级人员信息")
+ @TableField(exist = false)
+ private AppUser topUser;
+ @ApiModelProperty(value = "下级人员列表")
+ @TableField(exist = false)
+ private List<AppUser> bottomUsers;
@ApiModelProperty(value = "合伙人积分数")
@TableField("part_point")
- private BigDecimal partPoint;
+ private Integer partPoint;
@ApiModelProperty(value = "合伙人培育积分数")
@TableField("part_grow_point")
- private BigDecimal partGrowPoint;
+ private Integer partGrowPoint;
@ApiModelProperty(value = "消费积分数")
@TableField("shop_point")
- private BigDecimal shopPoint;
+ private Integer shopPoint;
@ApiModelProperty(value = "返佣积分数")
@TableField("share_point")
- private BigDecimal sharePoint;
+ private Integer sharePoint;
@ApiModelProperty(value = "消费总金额")
@TableField("shop_amount")
@@ -123,6 +146,10 @@
@ApiModelProperty(value = "最后消费时间")
@TableField("last_shop_time")
private LocalDateTime lastShopTime;
+
+ @ApiModelProperty(value = "账户余额")
+ @TableField("balance")
+ private BigDecimal balance;
@ApiModelProperty(value = "可提现金额")
@TableField("withdrawable_amount")
@@ -143,10 +170,15 @@
@ApiModelProperty(value = "分销总金额")
@TableField("total_distribution_amount")
private BigDecimal totalDistributionAmount;
-
+
+
@ApiModelProperty(value = "剩余积分")
@TableField("lave_point")
- private BigDecimal lavePoint;
+ private Integer lavePoint;
+
+ @ApiModelProperty(value = "总积分")
+ @TableField("total_point")
+ private Integer totalPoint;
@ApiModelProperty(value = "是否可更换推广人（0=否，1=是）")
@TableField("change_promoter")
@@ -183,26 +215,56 @@
@ApiModelProperty(value = "区编号")
@TableField("district_code")
private String districtCode;
+ @ApiModelProperty(value = "区编号")
+ @TableField("qr_code")
+ private String qrCode;
@ApiModelProperty("等级1会员数")
+ @TableField(exist = false)
private Long count1;
@ApiModelProperty("等级2会员数")
+ @TableField(exist = false)
private Long count2;
@ApiModelProperty("等级3会员数")
+ @TableField(exist = false)
private Long count3;
@ApiModelProperty("等级4会员数")
+ @TableField(exist = false)
private Long count4;
@ApiModelProperty("等级5会员数")
+ @TableField(exist = false)
private Long count5;
@ApiModelProperty("等级6会员数")
+ @TableField(exist = false)
private Long count6;
@ApiModelProperty("等级7会员数")
+ @TableField(exist = false)
private Long count7;
+ @ApiModelProperty("是否签到1是0否")
+ @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;
+
+
+
+
}
--
Gitblit v1.7.1