From 37235c82903aaf4e7efe3096174f4a4f6430caef Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 17 十二月 2024 09:41:28 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/VipSetting.java | 80 +++++++++++++++++++++++++--------------
1 files changed, 51 insertions(+), 29 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 d01cb46..07fc02d 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
@@ -10,6 +10,7 @@
import java.io.Serializable;
import java.math.BigDecimal;
+import java.util.List;
/**
* <p>
@@ -39,17 +40,21 @@
@TableField("vip_info")
private String vipInfo;
- @ApiModelProperty(value = "1级会员用 注册 天后 未成为黄金会员自动解绑推广人")
+ @ApiModelProperty(value = "1级会员专用 自动解绑推广人天数: 达到设置天数未成为黄金会员自动解绑推广人")
@TableField("vip_cancel_day")
private Integer vipCancelDay;
- @ApiModelProperty(value = "1级会员用 注册 天后 未在商城下单，可更换推广人")
+ @ApiModelProperty(value = "1级会员专用 可更换绑定人天数：用户在达到设置的天数未下单商品，可以更换绑定人")
@TableField("vip_change_day")
private Integer vipChangeDay;
- @ApiModelProperty(value = "钱包提现权限1开0关")
+ @ApiModelProperty(value = "钱包提现权限:1开0关")
@TableField("vip_withdrawal_role")
private Integer vipWithdrawalRole;
+
+ @ApiModelProperty(value = "钱包提现权限:1开0关")
+ @TableField("vip_agent_level_up_role")
+ private Integer vipAgentLevelUpRole;
@ApiModelProperty(value = "最低提现门槛")
@TableField("vip_withdrawal_min_amount")
@@ -63,69 +68,86 @@
@TableField("vip_gift_role")
private Integer vipGiftRole;
- @ApiModelProperty(value = "消费达到积分 后升级")
+ @ApiModelProperty(value = "达成会员等级所需消费积分数量")
@TableField("vip_level_up_shop")
- private BigDecimal vipLevelUpShop;
+ private Integer vipLevelUpShop;
- @ApiModelProperty(value = "普通会员：达到消费积分后升级开关 1开0关")
+ @ApiModelProperty(value = "通过消费积分达成会员等级的开关 1开0关")
@TableField("vip_level_up_shop_role")
private Integer vipLevelUpShopRole;
- @ApiModelProperty(value = "返佣达到积分 后升级")
+ @ApiModelProperty(value = "达成会员等级所需的返佣积分数量")
@TableField("vip_level_up_share")
- private BigDecimal vipLevelUpShare;
+ private Integer vipLevelUpShare;
- @ApiModelProperty(value = "普通会员：返佣积分后升级开关 1开0关")
+ @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;
- @ApiModelProperty(value = "普通会员：团队人数达到后升级")
+ @ApiModelProperty(value = "达成会员等级所需的团队数量")
@TableField("vip_team_num")
private Integer vipTeamNum;
- @ApiModelProperty(value = "普通会员：推广人数升级开关 1开0关")
+ @ApiModelProperty(value = "通过直推用户或团队数量的方式达成会员等级的开关 1开0关")
@TableField("vip_level_up_num_role")
private Integer vipLevelUpNumRole;
- @ApiModelProperty(value = "创业者：直推钻石会员")
+
+
+ @ApiModelProperty(value = "达成会员等级所需准代理数（达成总代和合伙人用到）")
@TableField("vip_direct_vip_num")
private Integer vipDirectVipNum;
- @ApiModelProperty(value = "创业者：直推钻石会员开关 1开0关")
- @TableField("vip_direct_vip_role")
- private Integer vipDirectVipRole;
+ @ApiModelProperty(value = "达成会员等级所需总代数量（达成合伙人用到）")
+ @TableField("vip_team_vip_num")
+ private Integer vipTeamVipNum;
- @ApiModelProperty(value = "保级：消费x天")
+ @ApiModelProperty(value = "达成会员等级所需开店数量")
+ @TableField("vip_open_shop_num")
+ private Integer vipOpenShopNum;
+
+
+
+ @ApiModelProperty(value = "消费积分保级周期（天）")
@TableField("keep_buy_day")
private Integer keepBuyDay;
- @ApiModelProperty(value = "保级：消费x分")
+ @ApiModelProperty(value = "消费积分保级的积分阈值（分））")
@TableField("keep_buy_point")
- private BigDecimal keepBuyPoint;
+ private Integer keepBuyPoint;
- @ApiModelProperty(value = "保级：返佣x天")
+ @ApiModelProperty(value = "返佣积分保的周期（天）")
@TableField("keep_share_day")
private Integer keepShareDay;
- @ApiModelProperty(value = "保级：返佣x分")
+ @ApiModelProperty(value = "返佣积分保级的积分阈值（分）")
@TableField("keep_share_point")
- private BigDecimal keepSharePoint;
+ private Integer keepSharePoint;
- @ApiModelProperty(value = "保级：门店x天")
+ @ApiModelProperty(value = "门店业绩积分保级的周期（天）")
@TableField("keep_shop_day")
private Integer keepShopDay;
- @ApiModelProperty(value = "保级：门店x分")
+ @ApiModelProperty(value = "门店业绩积分保级的积分阈值（分）")
@TableField("keep_shop_point")
- private BigDecimal keepShopPoint;
+ private Integer keepShopPoint;
+
+ @ApiModelProperty(value = "会员等级是否必须达到代理： 0-否 1-是")
+ @TableField("vip_level_up_proxy_role")
+ private Integer vipLevelUpProxyRole;
+
+ @ApiModelProperty(value = "指定会员升级商品")
+ @TableField("good_ids")
+ private String goodIds;
+
+
+ @ApiModelProperty("指定商品列表")
+ @TableField(exist = false)
+ private List<Goods> goodsList;
}
--
Gitblit v1.7.1