From c8daa9e8958f5dd4d2e2de5f6560f7f1e3065786 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 26 十二月 2024 20:37:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java | 33 +++++++++++++++++++++++++--------
1 files changed, 25 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 9499843..a6fe964 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
@@ -98,12 +98,9 @@
@ApiModelProperty(value = "推广人姓名")
@TableField(exist = false)
private String inviteUserName;
-
-
-
@ApiModelProperty(value = "绑定门店id")
@TableField("shop_id")
- private Long shopId;
+ private Integer shopId;
@ApiModelProperty(value = "绑定门店名称")
@TableField(exist = false)
private String shopName;
@@ -178,6 +175,26 @@
@ApiModelProperty(value = "注册积分总数")
@TableField("total_register_point")
private Integer totalRegisterPoint;
+
+ @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")
+ private BigDecimal shopServiceFee;
+
+ @ApiModelProperty(value = "门店返佣金额（绑定用户消费后返佣）")
+ @TableField("shop_commission")
+ private BigDecimal shopCommission;
// @ApiModelProperty(value = "做工积分总数")
// @TableField("total_work_point")
@@ -200,13 +217,13 @@
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