From 6587cae4a354c771e21ca5ae3d37e9b45c71c01e Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 05 十二月 2024 11:33:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 52 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 c8cfc28..4914aad 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
@@ -33,6 +33,9 @@
@TableId("id")
private Long id;
+ @ApiModelProperty(value = "用户类型（1-普通用户，2-门店员工）")
+ private Integer userType;
+
@ApiModelProperty(value = "用户")
@TableField("name")
private String name;
@@ -85,26 +88,34 @@
@ApiModelProperty(value = "推广人id")
@TableField("invite_user_id")
private Long inviteUserId;
+ @ApiModelProperty(value = "推广人姓名")
+ @TableField(exist = false)
+ private String inviteUserName;
+
+
@ApiModelProperty(value = "绑定门店id")
@TableField("shop_id")
private Long shopId;
+ @ApiModelProperty(value = "绑定门店名称")
+ @TableField(exist = false)
+ private String shopName;
@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")
@@ -113,6 +124,10 @@
@ApiModelProperty(value = "最后消费时间")
@TableField("last_shop_time")
private LocalDateTime lastShopTime;
+
+ @ApiModelProperty(value = "账户余额")
+ @TableField("balance")
+ private BigDecimal balance;
@ApiModelProperty(value = "可提现金额")
@TableField("withdrawable_amount")
@@ -133,10 +148,11 @@
@ApiModelProperty(value = "分销总金额")
@TableField("total_distribution_amount")
private BigDecimal totalDistributionAmount;
-
+
+
@ApiModelProperty(value = "剩余积分")
@TableField("lave_point")
- private BigDecimal lavePoint;
+ private Integer lavePoint;
@ApiModelProperty(value = "是否可更换推广人（0=否，1=是）")
@TableField("change_promoter")
@@ -174,4 +190,34 @@
@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