From 97d99b76bdde8952cf257c3c85c1a8a080927af4 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 31 三月 2025 16:44:22 +0800
Subject: [PATCH] 修改反馈文档bug
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java | 71 +++++++++++++++++++++++++++++++----
1 files changed, 62 insertions(+), 9 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 4b7cb2e..bb22241 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,9 +2,10 @@
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 com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -77,7 +78,6 @@
@ApiModelProperty(value = "删除（0=否，1=是）")
@TableField("del_flag")
- @TableLogic
private Boolean delFlag;
@ApiModelProperty(value = "0否1是第一次添加")
@@ -98,6 +98,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;
@@ -119,6 +125,9 @@
@ApiModelProperty(value = "下级人员列表")
@TableField(exist = false)
private List<AppUser> bottomUsers;
+
+ @TableField(exist = false)
+ private Page<AppUser> bottomUsersPage;
@ApiModelProperty(value = "合伙人积分数")
@TableField("part_point")
@@ -168,6 +177,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;
@@ -175,14 +192,18 @@
@ApiModelProperty(value = "注册积分总数")
@TableField("total_register_point")
private Integer totalRegisterPoint;
-
- @ApiModelProperty(value = "门店业绩积分")
- @TableField("shop_achievement_point")
- private Integer shopAchievementPoint;
+
+ @ApiModelProperty(value = "绑定下级门店分佣积分")
+ @TableField("lower_level_share_point")
+ private Integer lowerLevelSharePoint;
@ApiModelProperty(value = "门店返佣积分")
@TableField("shop_share_point")
private Integer shopSharePoint;
+
+ @ApiModelProperty(value = "门店业绩积分")
+ @TableField("shop_achievement_point")
+ private Integer shopAchievementPoint;
@ApiModelProperty(value = "门店服务费（门店核销获得）")
@TableField("shop_service_fee")
@@ -212,14 +233,25 @@
@TableField("total_performance_point")
private Integer totalPerformancePoint;
-
@ApiModelProperty(value = "总积分")
@TableField("total_point")
private Integer totalPoint;
- @ApiModelProperty(value = "剩余积分（可用于消费的积分）")
+ @ApiModelProperty(value = "剩余积分")
@TableField("lave_point")
private Integer lavePoint;
+
+ @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")
@@ -296,7 +328,7 @@
@TableField(exist = false)
private Set<Integer> shopIds;
- @ApiModelProperty(value = "降级预警")
+ @ApiModelProperty(value = "降级预警（0=否，1=是）")
@TableField("is_danger")
private Integer isDanger;
@@ -305,12 +337,33 @@
@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 (totalPoint == null){
+ totalPoint = 0;
+ }
+ if (lowerLevelSharePoint == null){
+ lowerLevelSharePoint = 0;
+ }
+ if (shopSharePoint == null){
+ shopSharePoint = 0;
+ }
+ if (shopAchievementPoint == null){
+ shopAchievementPoint = 0;
+ }
+ return totalPoint - lowerLevelSharePoint - shopSharePoint - shopAchievementPoint;
+ }
+
}
--
Gitblit v1.7.1