From a981c07d34edd0975b9d556d97c1f851ce79974c Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 04 十二月 2024 13:40:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java |  112 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 101 insertions(+), 11 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 51789a6..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;
@@ -77,30 +80,42 @@
     @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("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,24 +125,99 @@
     @TableField("last_shop_time")
     private LocalDateTime lastShopTime;
 
+    @ApiModelProperty(value = "账户余额")
+    @TableField("balance")
+    private BigDecimal balance;
+
     @ApiModelProperty(value = "可提现金额")
     @TableField("withdrawable_amount")
-    private BigDecimal withdrawal_amount;
+    private BigDecimal withdrawableAmount;
 
     @ApiModelProperty(value = "已提现金额")
     @TableField("withdrawn_amount")
-    private BigDecimal withdrawn_amount;
+    private BigDecimal withdrawnAmount;
 
     @ApiModelProperty(value = "充值总金额")
     @TableField("total_recharge_amount")
-    private BigDecimal total_recharge_amount;
+    private BigDecimal totalRechargeAmount;
 
     @ApiModelProperty(value = "红包总金额")
     @TableField("total_red_packet_amount")
-    private BigDecimal total_red_packet_amount;
+    private BigDecimal totalRedPacketAmount;
 
     @ApiModelProperty(value = "分销总金额")
     @TableField("total_distribution_amount")
-    private BigDecimal 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