From 3eaa323545e3d4f781bfeb16c68a30cc610a69b9 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期二, 03 十二月 2024 11:13:58 +0800
Subject: [PATCH] 1.分佣延迟队列

---
 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java |   24 ++++++++++++++++--------
 1 files changed, 16 insertions(+), 8 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..bf858fd 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;
@@ -89,9 +92,7 @@
     @TableField(exist = false)
     private String inviteUserName;
 
-    @ApiModelProperty(value = "当前用户顶级的推广人id")
-    @TableField("top_invite_id")
-    private Long topInviteId;
+
 
     @ApiModelProperty(value = "绑定门店id")
     @TableField("shop_id")
@@ -102,19 +103,19 @@
 
     @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 +124,10 @@
     @ApiModelProperty(value = "最后消费时间")
     @TableField("last_shop_time")
     private LocalDateTime lastShopTime;
+
+    @ApiModelProperty(value = "账户余额")
+    @TableField("balance")
+    private BigDecimal balance;
 
     @ApiModelProperty(value = "可提现金额")
     @TableField("withdrawable_amount")
@@ -143,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")
@@ -205,4 +211,6 @@
     @ApiModelProperty("等级7会员数")
     private Long count7;
 
+
+
 }

--
Gitblit v1.7.1