From d51a8cfa10c34d9c1e7d6b4726d31e75ecee5dc6 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期五, 20 十二月 2024 18:32:03 +0800
Subject: [PATCH] 1

---
 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/VipSetting.java |   53 ++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 36 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..9e46846 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 = "自动解绑推广人天数: 达到设置天数未成为黄金会员自动解绑推广人")
+    @ApiModelProperty(value = "1级会员专用 自动解绑推广人天数: 达到设置天数未成为黄金会员自动解绑推广人")
     @TableField("vip_cancel_day")
     private Integer vipCancelDay;
 
-    @ApiModelProperty(value = "可更换绑定人天数:用户在达到设置的天数未下单商品,可以更换绑定人")
+    @ApiModelProperty(value = "1级会员专用 可更换绑定人天数:用户在达到设置的天数未下单商品,可以更换绑定人")
     @TableField("vip_change_day")
     private Integer vipChangeDay;
 
     @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")
@@ -65,7 +70,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 +78,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 +97,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 +118,7 @@
 
     @ApiModelProperty(value = "消费积分保级的积分阈值(分))")
     @TableField("keep_buy_point")
-    private BigDecimal keepBuyPoint;
+    private Integer keepBuyPoint;
 
     @ApiModelProperty(value = "返佣积分保的周期(天)")
     @TableField("keep_share_day")
@@ -121,7 +126,7 @@
 
     @ApiModelProperty(value = "返佣积分保级的积分阈值(分)")
     @TableField("keep_share_point")
-    private BigDecimal keepSharePoint;
+    private Integer keepSharePoint;
 
     @ApiModelProperty(value = "门店业绩积分保级的周期(天)")
     @TableField("keep_shop_day")
@@ -129,7 +134,21 @@
 
     @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