From 6dd4dd793db22feb769dcfec2a190846f06cee54 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期五, 06 十二月 2024 17:40:14 +0800
Subject: [PATCH] 1.
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/TechnicianVO.java | 2 ++
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/GoodsVO.java | 1 +
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/TechnicianDetailVO.java | 2 ++
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/VipSetting.java | 30 +++++++++++++++---------------
4 files changed, 20 insertions(+), 15 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..3640be0 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;
@@ -79,11 +79,7 @@
@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;
}
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/GoodsVO.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/GoodsVO.java
index 28d08e6..470b0e5 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/GoodsVO.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/GoodsVO.java
@@ -50,4 +50,5 @@
@ApiModelProperty(value = "已售数量")
private Integer saleNum;
+
}
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/TechnicianDetailVO.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/TechnicianDetailVO.java
index e5bc269..63d3063 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/TechnicianDetailVO.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/TechnicianDetailVO.java
@@ -1,11 +1,13 @@
package com.ruoyi.other.vo;
+import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
@Data
+@ApiModel(value="技师详情对象", description="技师详情对象")
public class TechnicianDetailVO {
/**
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/TechnicianVO.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/TechnicianVO.java
index 8b9c9ea..4bd5903 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/TechnicianVO.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/TechnicianVO.java
@@ -1,12 +1,14 @@
package com.ruoyi.other.vo;
import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
@Data
+@ApiModel(value="技师对象", description="技师对象")
public class TechnicianVO {
@ApiModelProperty(value = "主键")
private Long id;
--
Gitblit v1.7.1