1.
phpcjl
2024-12-06 b735cf962be6ea4255fb57389090d54f4977da55
1.
2个文件已修改
90 ■■■■■ 已修改文件
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/VipCenterController.java 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/vo/vip/Level.java 77 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/VipCenterController.java
@@ -8,6 +8,7 @@
import com.ruoyi.account.vo.vip.Level;
import com.ruoyi.account.vo.vip.VipLevel;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.bean.BeanUtils;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.other.api.domain.*;
import com.ruoyi.other.api.feignClient.BaseSettingClient;
@@ -87,18 +88,8 @@
            vipSettingList.forEach(vipSetting -> {
                Level level = new Level();
                level.setId(vipSetting.getId());
                level.setName(vipSetting.getVipName());
                level.setVipInfo(vipSetting.getVipInfo());
                BeanUtils.copyBeanProp(level, vipSetting);
                level.setVipDesc(baseSetting.getContent());
                level.setVipLevelUpShop(vipSetting.getVipLevelUpShop());
                level.setVipLevelUpShare(vipSetting.getVipLevelUpShare());
                level.setKeepBuyDay(vipSetting.getKeepBuyDay());
                level.setKeepBuyPoint(vipSetting.getKeepBuyPoint());
                level.setKeepShareDay(vipSetting.getKeepShareDay());
                level.setKeepSharePoint(vipSetting.getKeepSharePoint());
                level.setKeepShopDay(vipSetting.getKeepShopDay());
                level.setKeepShopPoint(vipSetting.getKeepShopPoint());
                R<GoodsVip> goodsVipR = goodsVipMap.get(vipSetting.getId());
                if (R.isSuccess(goodsVipR)) {
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,53 +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 = "消费达到积分 后升级")
    @ApiModelProperty(value = "1级会员专用 可更换绑定人天数:用户在达到设置的天数未下单商品,可以更换绑定人")
    private Integer vipChangeDay;
    @ApiModelProperty(value = "钱包提现权限:1开0关")
    private Integer vipWithdrawalRole;
    @ApiModelProperty(value = "最低提现门槛")
    private BigDecimal vipWithdrawalMinAmount;
    @ApiModelProperty(value = "提现手续费")
    private BigDecimal vipWithdrawalFee;
    @ApiModelProperty(value = "积分转赠权限 1开0关")
    private Integer vipGiftRole;
    @ApiModelProperty(value = "达成会员等级所需消费积分数量")
    private Integer vipLevelUpShop;
    @ApiModelProperty(value = "返佣达到积分 后升级")
    @ApiModelProperty(value = "通过消费积分达成会员等级的开关 1开0关")
    private Integer vipLevelUpShopRole;
    @ApiModelProperty(value = "达成会员等级所需的返佣积分数量")
    private Integer vipLevelUpShare;
    @ApiModelProperty(value = "升级会员的直推用户人数要求")
    @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分")
    @ApiModelProperty(value = "消费积分保级的积分阈值(分))")
    private Integer keepBuyPoint;
    @ApiModelProperty(value = "保级:返佣x天")
    @ApiModelProperty(value = "返佣积分保的周期(天)")
    private Integer keepShareDay;
    @ApiModelProperty(value = "保级:返佣x分")
    @ApiModelProperty(value = "返佣积分保级的积分阈值(分)")
    private Integer keepSharePoint;
    @ApiModelProperty(value = "保级:门店x天")
    @ApiModelProperty(value = "门店业绩积分保级的周期(天)")
    private Integer keepShopDay;
    @ApiModelProperty(value = "保级:门店x分")
    @ApiModelProperty(value = "门店业绩积分保级的积分阈值(分)")
    private Integer keepShopPoint;
    @ApiModelProperty(value = "指定购买商品")
    @ApiModelProperty(value = "会员描述")
    private String vipDesc;
    @ApiModelProperty(value = "会员商品名称")
    private List<String> goodsNames;
}