From 6b12805b53f7a6d131b5cffcf45e3b3c68336568 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 09 十二月 2024 10:35:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/vo/vip/Level.java | 82 +++++++++++++++++++++++++++++-----------
1 files changed, 59 insertions(+), 23 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/vo/vip/Level.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/vo/vip/Level.java
index 855de5c..d136501 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/vo/vip/Level.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/vo/vip/Level.java
@@ -1,6 +1,5 @@
package com.ruoyi.account.vo.vip;
-import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -13,48 +12,85 @@
@ApiModelProperty(value = "会员等级id")
private Integer id;
- /**
- * 会员名称
- */
@ApiModelProperty(value = "会员名称")
private String name;
@ApiModelProperty(value = "会员专属权益")
private String vipInfo;
- @ApiModelProperty(value = "会员说明")
- private String vipDesc;
+ @ApiModelProperty(value = "1级会员专用 自动解绑推广人天数: 达到设置天数未成为黄金会员自动解绑推广人")
+ private Integer vipCancelDay;
- @ApiModelProperty(value = "消费达到积分 后升级")
- private BigDecimal vipLevelUpShop;
+ @ApiModelProperty(value = "1级会员专用 可更换绑定人天数：用户在达到设置的天数未下单商品，可以更换绑定人")
+ private Integer vipChangeDay;
- @ApiModelProperty(value = "返佣达到积分 后升级")
- private BigDecimal vipLevelUpShare;
+ @ApiModelProperty(value = "钱包提现权限:1开0关")
+ private Integer vipWithdrawalRole;
- @ApiModelProperty(value = "升级会员的直推用户人数要求")
+ @ApiModelProperty(value = "最低提现门槛")
+ private BigDecimal vipWithdrawalMinAmount;
+
+ @ApiModelProperty(value = "提现手续费")
+ private BigDecimal vipWithdrawalFee;
+
+ @ApiModelProperty(value = "积分转赠权限 1开0关")
+ private Integer vipGiftRole;
+
+ @ApiModelProperty(value = "达成会员等级所需消费积分数量")
+ private Integer vipLevelUpShop;
+
+ @ApiModelProperty(value = "通过消费积分达成会员等级的开关 1开0关")
+ private Integer vipLevelUpShopRole;
+
+ @ApiModelProperty(value = "达成会员等级所需的返佣积分数量")
+ private Integer vipLevelUpShare;
+
+ @ApiModelProperty(value = "通过返佣积分达成会员等级的开关 1开0关")
+ private Integer vipLevelUpShareRole;
+
+ @ApiModelProperty(value = "达成会员等级所需的直推人数（包括钻石和代理）")
private Integer vipDirectNum;
- @ApiModelProperty(value = "升级会员的团队数要求")
+
+ @ApiModelProperty(value = "达成会员等级所需的团队数量")
private Integer vipTeamNum;
- @ApiModelProperty(value = "保级：消费x天")
+ @ApiModelProperty(value = "通过直推用户或团队数量的方式达成会员等级的开关 1开0关")
+ private Integer vipLevelUpNumRole;
+
+
+
+ @ApiModelProperty(value = "达成会员等级所需准代理数（达成总代和合伙人用到）")
+ private Integer vipDirectVipNum;
+
+ @ApiModelProperty(value = "达成会员等级所需总代数量（达成合伙人用到）")
+ private Integer vipTeamVipNum;
+
+ @ApiModelProperty(value = "达成会员等级所需开店数量")
+ private Integer vipOpenShopNum;
+
+
+
+ @ApiModelProperty(value = "消费积分保级周期（天）")
private Integer keepBuyDay;
- @ApiModelProperty(value = "保级：消费x分")
- private BigDecimal keepBuyPoint;
+ @ApiModelProperty(value = "消费积分保级的积分阈值（分））")
+ private Integer keepBuyPoint;
- @ApiModelProperty(value = "保级：返佣x天")
+ @ApiModelProperty(value = "返佣积分保的周期（天）")
private Integer keepShareDay;
- @ApiModelProperty(value = "保级：返佣x分")
- private BigDecimal keepSharePoint;
+ @ApiModelProperty(value = "返佣积分保级的积分阈值（分）")
+ private Integer keepSharePoint;
- @ApiModelProperty(value = "保级：门店x天")
+ @ApiModelProperty(value = "门店业绩积分保级的周期（天）")
private Integer keepShopDay;
- @ApiModelProperty(value = "保级：门店x分")
- private BigDecimal keepShopPoint;
+ @ApiModelProperty(value = "门店业绩积分保级的积分阈值（分）")
+ private Integer keepShopPoint;
+ @ApiModelProperty(value = "会员描述")
+ private String vipDesc;
-
-
+ @ApiModelProperty(value = "会员商品名称")
+ private List<String> goodsNames;
}
--
Gitblit v1.7.1