From 551e4fe94b505f483e8b675af05d0d671030dc00 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期五, 06 十二月 2024 10:04:40 +0800
Subject: [PATCH] 1.
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java | 135 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 129 insertions(+), 6 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 0837295..47ea3b0 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
@@ -12,6 +12,7 @@
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
+import java.util.List;
/**
* <p>
@@ -32,6 +33,9 @@
@ApiModelProperty(value = "主键")
@TableId("id")
private Long id;
+
+ @ApiModelProperty(value = "用户类型（1-普通用户，2-门店员工）")
+ private Integer userType;
@ApiModelProperty(value = "用户")
@TableField("name")
@@ -77,30 +81,54 @@
@ApiModelProperty(value = "最后一次登录时间")
@TableField("last_login_time")
private LocalDateTime lastLoginTime;
+
+ @ApiModelProperty(value = "顶级推广人id")
+ @TableField("top_invite_id")
+ private Long topInviteId;
@ApiModelProperty(value = "推广人id")
@TableField("invite_user_id")
private Long inviteUserId;
+ @ApiModelProperty(value = "推广人姓名")
+ @TableField(exist = false)
+ private String inviteUserName;
- @ApiModelProperty(value = "拥有门店id")
+
+
+ @ApiModelProperty(value = "绑定门店id")
@TableField("shop_id")
- private Integer shopId;
+ private Long shopId;
+ @ApiModelProperty(value = "绑定门店名称")
+ @TableField(exist = false)
+ private String shopName;
+ @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")
@@ -110,5 +138,100 @@
@TableField("last_shop_time")
private LocalDateTime lastShopTime;
+ @ApiModelProperty(value = "账户余额")
+ @TableField("balance")
+ private BigDecimal balance;
+
+ @ApiModelProperty(value = "可提现金额")
+ @TableField("withdrawable_amount")
+ private BigDecimal withdrawableAmount;
+
+ @ApiModelProperty(value = "已提现金额")
+ @TableField("withdrawn_amount")
+ private BigDecimal withdrawnAmount;
+
+ @ApiModelProperty(value = "充值总金额")
+ @TableField("total_recharge_amount")
+ private BigDecimal totalRechargeAmount;
+
+ @ApiModelProperty(value = "红包总金额")
+ @TableField("total_red_packet_amount")
+ private BigDecimal totalRedPacketAmount;
+
+ @ApiModelProperty(value = "分销总金额")
+ @TableField("total_distribution_amount")
+ private BigDecimal totalDistributionAmount;
+
+
+ @ApiModelProperty(value = "剩余积分")
+ @TableField("lave_point")
+ private Integer lavePoint;
+
+ @ApiModelProperty(value = "是否可更换推广人（0=否，1=是）")
+ @TableField("change_promoter")
+ private Integer changePromoter;
+
+ @ApiModelProperty(value = "经度")
+ @TableField("longitude")
+ private String longitude;
+
+ @ApiModelProperty(value = "纬度")
+ @TableField("latitude")
+ private String latitude;
+
+ @ApiModelProperty(value = "省")
+ @TableField("province")
+ private String province;
+
+ @ApiModelProperty(value = "省编号")
+ @TableField("province_code")
+ private String provinceCode;
+
+ @ApiModelProperty(value = "市")
+ @TableField("city")
+ private String city;
+
+ @ApiModelProperty(value = "市编号")
+ @TableField("city_code")
+ private String cityCode;
+
+ @ApiModelProperty(value = "区")
+ @TableField("district")
+ private String district;
+
+ @ApiModelProperty(value = "区编号")
+ @TableField("district_code")
+ private String districtCode;
+
+ @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;
+
+
+
}
--
Gitblit v1.7.1