From c4957e23c2ddf38442f88acceb83c87ad879943a Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 26 十二月 2024 20:36:59 +0800
Subject: [PATCH] 修改分佣逻辑
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java | 66 +++++++++++++++++++++++++++++----
1 files changed, 58 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 a7914ca..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
@@ -72,7 +72,7 @@
@ApiModelProperty(value = "添加时间")
@TableField("create_time")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
@ApiModelProperty(value = "删除（0=否，1=是）")
@@ -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;
@@ -171,14 +168,62 @@
@TableField("total_distribution_amount")
private BigDecimal totalDistributionAmount;
+ @ApiModelProperty(value = "拉新人积分总数")
+ @TableField("total_invite_point")
+ private Integer totalInvitePoint;
- @ApiModelProperty(value = "剩余积分")
- @TableField("lave_point")
- private Integer lavePoint;
+ @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")
+// 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("total_point")
private Integer totalPoint;
+
+ @ApiModelProperty(value = "剩余积分（可用于消费的积分）")
+ @TableField("lave_point")
+ private Integer lavePoint;
@ApiModelProperty(value = "是否可更换推广人（0=否，1=是）")
@TableField("change_promoter")
@@ -265,6 +310,11 @@
private LocalDateTime lastOrderTime;
+ public String getIdStr(){
+ return String.valueOf(id);
+ }
+
+
}
--
Gitblit v1.7.1