redbagprod

xiaoyong931011

2023-10-11 63a12d1eaaea08d7573e2788156adb7976a8a32d

 src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java

@@ -6,6 +6,7 @@
import cc.mrbird.febs.mall.entity.AppVersion;
import cc.mrbird.febs.mall.entity.MallMember;
import cc.mrbird.febs.mall.entity.MallNewsInfo;
import cc.mrbird.febs.mall.entity.MallShopApply;
import cc.mrbird.febs.mall.service.IAdminMallMemberService;
import cc.mrbird.febs.mall.vo.*;
import lombok.RequiredArgsConstructor;
@@ -48,6 +49,16 @@
    }

    /**
     * 会员列表
     * @return
     */
    @GetMapping("mallMemberListS")
    @RequiresPermissions("mallMemberListS:view")
    public String mallMemberListS() {
        return FebsUtil.view("modules/mallMember/mallMemberListS");
    }

    /**
     * 会员列表-个人详情
     * @param id
     * @param model
@@ -67,11 +78,12 @@
     * @param model
     * @return
     */
    @GetMapping("mallSystemPay/{id}")
    @GetMapping("mallSystemPay/{type}/{id}")
    @RequiresPermissions("mallSystemPay:update")
    public String systemPay(@PathVariable long id, Model model) {
    public String systemPay(@PathVariable long id, @PathVariable Integer type, Model model) {
        MallMemberVo data = mallMemberService.getMallMemberInfoById(id);
        model.addAttribute("systemPay", data);
        model.addAttribute("type", type);
        return FebsUtil.view("modules/mallMember/mallSystemPay");
    }

@@ -116,7 +128,8 @@
    @GetMapping("paymentInfo/{id}")
    @RequiresPermissions("paymentInfo:update")
    public String paymentInfo(@PathVariable long id, Model model) {
        AdminMallMemberPaymentVo data = mallMemberService.getMallMemberPaymentInfoByFlowId(id);
//        AdminMallMemberPaymentVo data = mallMemberService.getMallMemberPaymentInfoByFlowId(id);
        AdminMallMemberPaymentVo data = mallMemberService.getMallBankInfoById(id);
        model.addAttribute("paymentInfo", data);
        return FebsUtil.view("modules/mallMember/paymentInfo");
    }
@@ -129,6 +142,16 @@
    @RequiresPermissions("agentList:view")
    public String agentList() {
        return FebsUtil.view("modules/mallMember/agentList");
    }

    /**
     * 代理列表
     * @return
     */
    @GetMapping("agentListS")
    @RequiresPermissions("agentListS:view")
    public String agentListS() {
        return FebsUtil.view("modules/mallMember/agentListS");
    }

    /**
@@ -168,6 +191,18 @@
    }

    /**
     * 代理级别-全部成员
     * @param id
     * @param model
     * @return
     */
    @GetMapping("agentAllMemberS/{id}")
    public String agentAllMemberS(@PathVariable long id, Model model) {
        idFromAgentAllMember = id;
        return FebsUtil.view("modules/mallMember/agentAllMemberS");
    }

    /**
     * 代理级别-设置代理
     * @param id
     * @param model
@@ -176,7 +211,9 @@
    @GetMapping("agentLevelSet/{id}")
    @RequiresPermissions("agentLevelSet:update")
    public String agentLevelSet(@PathVariable long id, Model model) {
        AdminAgentLevelSetInfoVo data = mallMemberService.getAgentLevelSetInfoByMemberId(id);
//        AdminAgentLevelSetInfoVo data = mallMemberService.getAgentLevelSetInfoByMemberId(id);
        AdminAgentLevelSetInfoVo data = new AdminAgentLevelSetInfoVo();
        data.setId(id);
        model.addAttribute("agentLevelSet", data);
        return FebsUtil.view("modules/mallMember/agentLevelSet");
    }
@@ -239,44 +276,31 @@
        return FebsUtil.view("modules/mallMember/appVerSionUpdate");
    }

    /**
     * 新闻中心-列表
     * @return
     */
    @GetMapping("newsInfoList")
    @RequiresPermissions("newsInfoList:view")
    public String newsInfoList() {
        return FebsUtil.view("modules/mallMember/newsInfoList");

    @GetMapping("shopApply")
    public String shopApply() {
        return FebsUtil.view("modules/mallMember/shopApply");
    }

    /**
     * 新闻中心-新增
     * @return
     */
    @GetMapping("newsInfoAdd")
    @RequiresPermissions("newsInfoAdd:add")
    public String newsInfoAdd() {
        return FebsUtil.view("modules/mallMember/newsInfoAdd");
    @GetMapping("applyDetail/{id}")
    public String applyDetail(@PathVariable("id") Long id, Model model) {
        MallShopApply apply = mallMemberService.findShopApplyById(id);
        model.addAttribute("apply", apply);
        return FebsUtil.view("modules/mallMember/shopApplyInfo");
    }

    /**
     * 新闻中心-详情
     * @param id
     * @param model
     * @return
     */
    @GetMapping("newsInfoUpdate/{id}")
    @RequiresPermissions("newsInfoUpdate:update")
    public String newsInfoUpdate(@PathVariable long id, Model model) {
        MallNewsInfo data = mallMemberService.getNewsInfoById(id);
        model.addAttribute("newsInfo", data);
        return FebsUtil.view("modules/mallMember/newsInfoUpdate");
    @GetMapping("updateReferer/{id}")
    public String updateReferer(@PathVariable("id") Long id, Model model) {
        MallMember member = mallMemberService.getById(id);
        model.addAttribute("referer", mallMemberService.findByInviteId(member.getReferrerId()));
        model.addAttribute("id", id);
        return FebsUtil.view("modules/mallMember/updateRefererId");
    }





    @GetMapping("addMember")
    public String addMember() {
        return FebsUtil.view("modules/mallMember/addMember");
    }