From 609d91e1e62b1e8932b34b15b09baf02e7f09a93 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 09 十二月 2024 10:36:47 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/VipSetting.java | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/VipSetting.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/VipSetting.java
index a059edc..efcb5a7 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/VipSetting.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/VipSetting.java
@@ -39,11 +39,11 @@
@TableField("vip_info")
private String vipInfo;
- @ApiModelProperty(value = "自动解绑推广人天数: 达到设置天数未成为黄金会员自动解绑推广人")
+ @ApiModelProperty(value = "1级会员专用 自动解绑推广人天数: 达到设置天数未成为黄金会员自动解绑推广人")
@TableField("vip_cancel_day")
private Integer vipCancelDay;
- @ApiModelProperty(value = "可更换绑定人天数：用户在达到设置的天数未下单商品，可以更换绑定人")
+ @ApiModelProperty(value = "1级会员专用 可更换绑定人天数：用户在达到设置的天数未下单商品，可以更换绑定人")
@TableField("vip_change_day")
private Integer vipChangeDay;
@@ -65,7 +65,7 @@
@ApiModelProperty(value = "达成会员等级所需消费积分数量")
@TableField("vip_level_up_shop")
- private BigDecimal vipLevelUpShop;
+ private Integer vipLevelUpShop;
@ApiModelProperty(value = "通过消费积分达成会员等级的开关 1开0关")
@TableField("vip_level_up_shop_role")
@@ -73,17 +73,13 @@
@ApiModelProperty(value = "达成会员等级所需的返佣积分数量")
@TableField("vip_level_up_share")
- private BigDecimal vipLevelUpShare;
+ private Integer vipLevelUpShare;
@ApiModelProperty(value = "通过返佣积分达成会员等级的开关 1开0关")
@TableField("vip_level_up_share_role")
private Integer vipLevelUpShareRole;
-// @ApiModelProperty(value = "创业者：消费并且返佣升级 1开0关")
-// @TableField("vip_agent_level_up_role")
-// private Integer vipAgentLevelUpRole;
-
- @ApiModelProperty(value = "达成会员等级所需的直推人数（包括砖石和代理）")
+ @ApiModelProperty(value = "达成会员等级所需的直推人数（包括钻石和代理）")
@TableField("vip_direct_num")
private Integer vipDirectNum;
@@ -96,14 +92,18 @@
private Integer vipLevelUpNumRole;
- @ApiModelProperty(value = "通过直推钻石用户达成会员等级的开关 1开0关")
- @TableField("vip_direct_vip_role")
- private Integer vipDirectVipRole;
-
- @ApiModelProperty(value = "达成会员等级所需准代理数")
+ @ApiModelProperty(value = "达成会员等级所需准代理数（达成总代和合伙人用到）")
@TableField("vip_direct_vip_num")
private Integer vipDirectVipNum;
+
+ @ApiModelProperty(value = "达成会员等级所需总代数量（达成合伙人用到）")
+ @TableField("vip_team_vip_num")
+ private Integer vipTeamVipNum;
+
+ @ApiModelProperty(value = "达成会员等级所需开店数量")
+ @TableField("vip_open_shop_num")
+ private Integer vipOpenShopNum;
@@ -113,7 +113,7 @@
@ApiModelProperty(value = "消费积分保级的积分阈值（分））")
@TableField("keep_buy_point")
- private BigDecimal keepBuyPoint;
+ private Integer keepBuyPoint;
@ApiModelProperty(value = "返佣积分保的周期（天）")
@TableField("keep_share_day")
@@ -121,7 +121,7 @@
@ApiModelProperty(value = "返佣积分保级的积分阈值（分）")
@TableField("keep_share_point")
- private BigDecimal keepSharePoint;
+ private Integer keepSharePoint;
@ApiModelProperty(value = "门店业绩积分保级的周期（天）")
@TableField("keep_shop_day")
@@ -129,7 +129,7 @@
@ApiModelProperty(value = "门店业绩积分保级的积分阈值（分）")
@TableField("keep_shop_point")
- private BigDecimal keepShopPoint;
+ private Integer keepShopPoint;
}
--
Gitblit v1.7.1