feat(mall): 添加会员角色ID字段

Administrator

2 days ago 1de2a86878a5adb98371758a770babb724ec5a67

 src/main/java/cc/mrbird/febs/mall/controller/memberLevel/AdminHappyMemberLevelController.java

@@ -5,33 +5,15 @@
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.entity.QueryRequest;
import cc.mrbird.febs.common.utils.RedisUtils;
import cc.mrbird.febs.common.utils.excl.ExcelSheetPO;
import cc.mrbird.febs.common.utils.excl.ExcelUtil;
import cc.mrbird.febs.common.utils.excl.ExcelVersion;
import cc.mrbird.febs.common.utils.excl.ResponseHeadUtil;
import cc.mrbird.febs.mall.dto.AdminHappyActivityCategoryDto;
import cc.mrbird.febs.mall.dto.activity.*;
import cc.mrbird.febs.mall.dto.memberLevel.*;
import cc.mrbird.febs.mall.entity.HappyActivity;
import cc.mrbird.febs.mall.entity.HappyActivityOption;
import cc.mrbird.febs.mall.service.AdminMemberLevelService;
import cc.mrbird.febs.mall.service.IAdminHappyActivityService;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import cc.mrbird.febs.mall.vo.memberLevel.AdminMemberLabelSetDto;
import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
import java.io.OutputStream;
import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;

@Slf4j
@@ -66,6 +48,17 @@


    /**
     * 会员标识-获取
     * @return
     */
    @GetMapping(value = "/parentAll")
    public FebsResponse parentAll() {

        return adminMemberLevelService.parentAll();
    }


    /**
     * 会员标识-更新
     */
    @PostMapping("labelUpdate")
@@ -73,6 +66,17 @@
    public FebsResponse labelUpdate(@RequestBody @Valid AdminMemberLabelUpdateDto dto) {

        return adminMemberLevelService.labelUpdate(dto);
    }


    /**
     * 会员标识-设置
     */
    @PostMapping("labelMemberSet")
    @ControllerEndpoint(operation = "会员标识-设置", exceptionMessage = "操作失败")
    public FebsResponse labelMemberSet(@RequestBody @Valid AdminMemberLabelSetDto dto) {

        return adminMemberLevelService.labelMemberSet(dto);
    }

    /**
@@ -116,6 +120,17 @@
        return adminMemberLevelService.levelAll();
    }

    /**
     * 会员等级-获取全部
     * @return
     */
    @GetMapping(value = "/memberRoleAll")
    public FebsResponse memberRoleAll() {

        String companyId = getCurrentUserCompanyId();
        return adminMemberLevelService.memberRoleAll(companyId);
    }



    /**