From 274673c7c81c639c1edb038281445f076c824dc1 Mon Sep 17 00:00:00 2001
From: luofl <1442745593@qq.com>
Date: 星期二, 18 三月 2025 09:08:17 +0800
Subject: [PATCH] 迭代版本：2.28
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java | 34 +++++++++++++++++++++++++++++++++-
1 files changed, 33 insertions(+), 1 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 1445973..c3b250c 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
@@ -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;
@@ -170,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;
@@ -217,7 +231,6 @@
@ApiModelProperty(value = "技师业绩积分总数")
@TableField("total_performance_point")
private Integer totalPerformancePoint;
-
@ApiModelProperty(value = "总积分")
@TableField("total_point")
@@ -323,11 +336,30 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime lastOrderTime;
+ @TableField(exist = false)
+ private Set<Long> userIds;
+
+ @TableField(exist = false)
+ private Integer excludeStatus;
+
public String getIdStr(){
return String.valueOf(id);
}
+ public Integer getUserTotalPoint(){
+ if (lowerLevelSharePoint == null){
+ lowerLevelSharePoint = 0;
+ }
+ if (shopSharePoint == null){
+ shopSharePoint = 0;
+ }
+ if (shopAchievementPoint == null){
+ shopAchievementPoint = 0;
+ }
+ return totalPoint - lowerLevelSharePoint - shopSharePoint - shopAchievementPoint;
+ }
+
}
--
Gitblit v1.7.1