From 15bfd012429367bf9b8f03bdc8bb101ae0bdfe4d Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 21 三月 2025 15:26:39 +0800
Subject: [PATCH] 修改统计bug
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java | 24 +++++++++++++++++++++++-
1 files changed, 23 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 b9f7026..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
@@ -5,6 +5,7 @@
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;
@@ -232,7 +233,6 @@
@TableField("total_performance_point")
private Integer totalPerformancePoint;
-
@ApiModelProperty(value = "总积分")
@TableField("total_point")
private Integer totalPoint;
@@ -337,11 +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