From d99d71c813349dc9c2fba6ee49da665043920c80 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期五, 20 十二月 2024 11:15:00 +0800
Subject: [PATCH] 1

---
 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java |   44 ++++++++++++++++++++++++++++++++++++--------
 1 files changed, 36 insertions(+), 8 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 5479c1b..1e4f31e 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
@@ -179,22 +179,50 @@
     @TableField("total_register_point")
     private Integer totalRegisterPoint;
 
-    @ApiModelProperty(value = "做工积分总数")
-    @TableField("total_work_point")
-    private Integer totalWorkPoint;
+    @ApiModelProperty(value = "门店业绩积分")
+    @TableField("shop_achievement_point")
+    private Integer shopAchievementPoint;
 
-    @ApiModelProperty(value = "业绩积分总数")
+    @ApiModelProperty(value = "门店返佣积分")
+    @TableField("shop_share_point")
+    private Integer shopSharePoint;
+
+    @ApiModelProperty(value = "门店服务费(门店核销获得)")
+    @TableField("shop_service_fee")
+    private BigDecimal shopServiceFee;
+
+    @ApiModelProperty(value = "门店返佣金额(绑定用户消费后返佣)")
+    @TableField("shop_commission")
+    private BigDecimal shopCommission;
+
+//    @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 = "剩余积分(可用于消费的积分)")
+    @TableField("lave_point")
+    private Integer lavePoint;
     
     @ApiModelProperty(value = "是否可更换推广人(0=否,1=是)")
     @TableField("change_promoter")

--
Gitblit v1.7.1