From 60f70f7409ec1ece8905e088fb43e0cb0258a70b Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 19 十二月 2024 10:10:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java | 66 +++++++++++++++++++++++++++++++++
1 files changed, 66 insertions(+), 0 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 47ea3b0..9499843 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
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -13,6 +14,7 @@
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.List;
+import java.util.Set;
/**
* <p>
@@ -40,6 +42,9 @@
@ApiModelProperty(value = "用户")
@TableField("name")
private String name;
+ @ApiModelProperty("会员名称")
+ @TableField(exist = false)
+ private String vipName;
@ApiModelProperty(value = "手机号")
@TableField("phone")
@@ -67,6 +72,7 @@
@ApiModelProperty(value = "添加时间")
@TableField("create_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
@ApiModelProperty(value = "删除（0=否，1=是）")
@@ -101,6 +107,9 @@
@ApiModelProperty(value = "绑定门店名称")
@TableField(exist = false)
private String shopName;
+ @ApiModelProperty(value = "绑定门店列表")
+ @TableField(exist = false)
+ private List<String> shopNames;
@ApiModelProperty(value = "绑定门店封面")
@TableField(exist = false)
private String shopCover;
@@ -162,10 +171,42 @@
@TableField("total_distribution_amount")
private BigDecimal totalDistributionAmount;
+ @ApiModelProperty(value = "拉新人积分总数")
+ @TableField("total_invite_point")
+ private Integer totalInvitePoint;
+
+ @ApiModelProperty(value = "注册积分总数")
+ @TableField("total_register_point")
+ private Integer totalRegisterPoint;
+
+// @ApiModelProperty(value = "做工积分总数")
+// @TableField("total_work_point")
+// private Integer totalWorkPoint;
+
+ @ApiModelProperty(value = "每日分享积分")
+ @TableField("total_share_point")
+ private Integer totalSharePoint;
+
+ @ApiModelProperty(value = "每日签到积分")
+ @TableField("total_sign_point")
+ private Integer totalSignPoint;
+
+ @ApiModelProperty(value = "使用时长积分")
+ @TableField("total_hour_point")
+ private Integer totalHourPoint;
+
+ @ApiModelProperty(value = "技师业绩积分总数")
+ @TableField("total_performance_point")
+ private Integer totalPerformancePoint;
+
@ApiModelProperty(value = "剩余积分")
@TableField("lave_point")
private Integer lavePoint;
+
+ @ApiModelProperty(value = "总积分")
+ @TableField("total_point")
+ private Integer totalPoint;
@ApiModelProperty(value = "是否可更换推广人（0=否，1=是）")
@TableField("change_promoter")
@@ -202,6 +243,9 @@
@ApiModelProperty(value = "区编号")
@TableField("district_code")
private String districtCode;
+ @ApiModelProperty(value = "区编号")
+ @TableField("qr_code")
+ private String qrCode;
@ApiModelProperty("等级1会员数")
@TableField(exist = false)
@@ -231,6 +275,28 @@
@TableField(exist = false)
private Long count7;
+ @ApiModelProperty("是否签到1是0否")
+ @TableField(exist = false)
+ private Integer isSign;
+
+ @ApiModelProperty("绑定门店id列表")
+ @TableField(exist = false)
+ private Set<Integer> shopIds;
+
+ @ApiModelProperty(value = "降级预警")
+ @TableField("is_danger")
+ private Integer isDanger;
+
+ @ApiModelProperty(value = "最后下单时间")
+ @TableField(exist = false)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime lastOrderTime;
+
+
+ public String getIdStr(){
+ return String.valueOf(id);
+ }
+
--
Gitblit v1.7.1