blame | history | patch | commit | commitdiff | ignore whitespace
Administrator
2 days ago 258dc93217e5af0bbe79802a665ef77e62fe7bc0 
 src/main/java/cc/mrbird/febs/mall/controller/memberLevel/AdminHappyMemberLevelController.java


@@ -5,34 +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 cc.mrbird.febs.mall.vo.memberLevel.AdminMemberLabelSetDto;


import cn.hutool.core.date.DateUtil;


import cn.hutool.core.util.StrUtil;


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


@@ -139,6 +120,17 @@


        return adminMemberLevelService.levelAll();


    }




    /**


     * 会员等级-获取全部


     * @return


     */


    @GetMapping(value = "/memberRoleAll")


    public FebsResponse memberRoleAll() {




        String companyId = getCurrentUserCompanyId();


        return adminMemberLevelService.memberRoleAll(companyId);


    }








    /**