From 0449a6264819bce3869f47b9e5bd3729f158db54 Mon Sep 17 00:00:00 2001
From: luofl <1442745593@qq.com>
Date: 星期五, 14 三月 2025 16:05:24 +0800
Subject: [PATCH] 迭代版本：2.28
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 insertions(+), 3 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 88b9f9e..ca0c317 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
@@ -2,8 +2,8 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -97,6 +97,12 @@
@ApiModelProperty(value = "推广人姓名")
@TableField(exist = false)
private String inviteUserName;
+ @ApiModelProperty(value = "指导老师")
+ @TableField(exist = false)
+ private String teacher;
+ @TableField(exist = false)
+ private String teacherPhone;
+
@ApiModelProperty(value = "绑定门店id")
@TableField("shop_id")
private Integer shopId;
@@ -118,6 +124,9 @@
@ApiModelProperty(value = "下级人员列表")
@TableField(exist = false)
private List<AppUser> bottomUsers;
+
+ @TableField(exist = false)
+ private Page<AppUser> bottomUsersPage;
@ApiModelProperty(value = "合伙人积分数")
@TableField("part_point")
@@ -167,6 +176,14 @@
@TableField("total_distribution_amount")
private BigDecimal totalDistributionAmount;
+ @ApiModelProperty(value = "冻结分佣金额")
+ @TableField("freeze_commission_amount")
+ private BigDecimal freezeCommissionAmount;
+
+ @ApiModelProperty(value = "冻结分佣积分")
+ @TableField("freeze_commission_point")
+ private Integer freezeCommissionPoint;
+
@ApiModelProperty(value = "拉新人积分总数")
@TableField("total_invite_point")
private Integer totalInvitePoint;
@@ -215,7 +232,6 @@
@TableField("total_performance_point")
private Integer totalPerformancePoint;
-
@ApiModelProperty(value = "总积分")
@TableField("total_point")
private Integer totalPoint;
@@ -227,6 +243,14 @@
@ApiModelProperty(value = "可用积分")
@TableField("available_point")
private Integer availablePoint;
+
+ @ApiModelProperty(value = "可用总积分数")
+ @TableField("total_available_point")
+ private Integer totalAvailablePoint;
+
+ @ApiModelProperty(value = "可转增积分")
+ @TableField("transferable_point")
+ private Integer transferablePoint;
@ApiModelProperty(value = "是否可更换推广人（0=否，1=是）")
@TableField("change_promoter")
@@ -303,7 +327,7 @@
@TableField(exist = false)
private Set<Integer> shopIds;
- @ApiModelProperty(value = "降级预警")
+ @ApiModelProperty(value = "降级预警（0=否，1=是）")
@TableField("is_danger")
private Integer isDanger;
@@ -312,6 +336,8 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime lastOrderTime;
+ @TableField(exist = false)
+ private Set<Long> userIds;
public String getIdStr(){
return String.valueOf(id);
--
Gitblit v1.7.1