fix

Hentua

2023-06-15 1d0d712b4f2b489e020cbf23eaf20e386eee1561

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

@@ -3,10 +3,12 @@
import cc.mrbird.febs.common.controller.BaseController;
import cc.mrbird.febs.common.entity.FebsConstant;
import cc.mrbird.febs.common.utils.FebsUtil;
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.AdminMallMemberPaymentVo;
import cc.mrbird.febs.mall.vo.MallMemberVo;
import cc.mrbird.febs.mall.vo.*;
import lombok.RequiredArgsConstructor;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.stereotype.Controller;
@@ -14,6 +16,9 @@
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;

import javax.servlet.http.HttpServletRequest;

@Controller("mallMemberView")
@RequestMapping(FebsConstant.VIEW_PREFIX + "modules/mallMember")
@@ -24,6 +29,22 @@

    public static long idFromMoneyFlow;

    public static long idFromAgentAllMember;

    public static long idFromScoreRoleRelease;

    public static long idFromScoreAchieveRelease;

    /**
     * 平台账单
     * @return
     */
    @GetMapping("mallDataList")
    @RequiresPermissions("mallDataList:view")
    public String mallDataList() {
        return FebsUtil.view("modules/mallMember/mallDataList");
    }

    /**
     * 会员列表
     * @return
@@ -32,6 +53,16 @@
    @RequiresPermissions("mallMemberList:view")
    public String mallMember() {
        return FebsUtil.view("modules/mallMember/mallMemberList");
    }

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

    /**
@@ -49,12 +80,43 @@
    }

    /**
     * 会员列表-系统拨付
     * @param id
     * @param model
     * @return
     */
    @GetMapping("mallSystemPay/{type}/{id}")
    @RequiresPermissions("mallSystemPay:update")
    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");
    }

    /**
     * 会员列表-系统拨付绿色凭证
     * @param id
     * @param model
     * @return
     */
    @GetMapping("voucherUpdate/{type}/{id}")
    @RequiresPermissions("voucherUpdate:update")
    public String voucherUpdate(@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/voucherUpdate");
    }

    /**
     * 会员列表-资金流水
     * @param id
     * @param model
     * @return
     */
    @GetMapping("moneyFlow/{id}")
    @RequiresPermissions("moneyFlow:update")
    public String moneyFlow(@PathVariable long id, Model model) {
        idFromMoneyFlow = id;
        return FebsUtil.view("modules/mallMember/moneyFlow");
@@ -66,7 +128,9 @@
     */
    @GetMapping("moneyFlowList")
    @RequiresPermissions("moneyFlowList:view")
    public String moneyFlowList() {
    public String moneyFlowList(String refererId, String inviteId, Model model) {
        model.addAttribute("referrerId", refererId);
        model.addAttribute("inviteId", inviteId);
        return FebsUtil.view("modules/mallMember/moneyFlowList");
    }

@@ -89,19 +153,243 @@
    @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");
    }

    /**
     * 代理列表
     * @return
     */
    @GetMapping("agentList")
    @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");
    }

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

    /**
     * 代理级别-详情
     * @param id
     * @param model
     * @return
     */
    @GetMapping("agentLevelUpdate/{id}")
    @RequiresPermissions("agentLevelUpdate:update")
    public String agentLevelUpdate(@PathVariable long id, Model model) {
        AdminAgentLevelUpdateInfoVo data = mallMemberService.getAgentLevelUpdateInfoById(id);
        model.addAttribute("agentLevelUpdateInfo", data);
        return FebsUtil.view("modules/mallMember/agentLevelUpdate");
    }

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

    /**
     * 代理级别-全部成员
     * @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
     * @return
     */
    @GetMapping("agentLevelSet/{id}")
    @RequiresPermissions("agentLevelSet:update")
    public String agentLevelSet(@PathVariable long id, Model model) {
        AdminAgentLevelSetInfoVo data = mallMemberService.getAgentLevelSetInfoByMemberId(id);
        model.addAttribute("agentLevelSet", data);
        return FebsUtil.view("modules/mallMember/agentLevelSet");
    }

    /**
     * 奖励设置-列表
     * @return
     */
    @GetMapping("rankAwardList")
    @RequiresPermissions("rankAwardList:view")
    public String rankAwardList() {
        return FebsUtil.view("modules/mallMember/rankAwardList");
    }

    /**
     * 奖励设置-详情
     * @param id
     * @param model
     * @return
     */
    @GetMapping("rankAwardUpdate/{id}")
    @RequiresPermissions("rankAwardUpdate:update")
    public String rankAwardUpdate(@PathVariable long id, Model model) {
        AdminRankAwardUpdateInfoVo data = mallMemberService.getRankAwardUpdateInfoById(id);
        model.addAttribute("rankAwardUpdateInfo", data);
        return FebsUtil.view("modules/mallMember/rankAwardUpdate");
    }

    /**
     * App版本-列表
     * @return
     */
    @GetMapping("appVersionList")
    @RequiresPermissions("appVersionList:view")
    public String appVersionList() {
        return FebsUtil.view("modules/mallMember/appVersionList");
    }

    /**
     * App版本-新增
     * @return
     */
    @GetMapping("appVersionAdd")
    @RequiresPermissions("appVersionAdd:add")
    public String appVersionAdd() {
        return FebsUtil.view("modules/mallMember/appVersionAdd");
    }

    /**
     * App版本-详情
     * @param id
     * @param model
     * @return
     */
    @GetMapping("appVerSionUpdate/{id}")
    @RequiresPermissions("appVerSionUpdate:update")
    public String appVerSionUpdate(@PathVariable long id, Model model) {
        AppVersion data = mallMemberService.getAppVersionInfoById(id);
        model.addAttribute("appVersion", data);
        return FebsUtil.view("modules/mallMember/appVerSionUpdate");
    }


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

    @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");
    }

    @GetMapping("updateReferer/{id}")
    @RequiresPermissions("updateReferer:update")
    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")
    @RequiresPermissions("addMember:update")
    public String addMember() {
        return FebsUtil.view("modules/mallMember/addMember");
    }


    /**
     * 创世释放记录-列表
     * @return
     */
    @GetMapping("scoreRoleRelease")
    @RequiresPermissions("scoreRoleRelease:view")
    public String scoreRoleRelease() {
        return FebsUtil.view("modules/mallMember/scoreRoleRelease");
    }

    /**
     * 创世释放记录-全部记录
     * @param id
     * @param model
     * @return
     */
    @GetMapping("scoreRoleReleaseList/{id}")
    public String scoreRoleReleaseList(@PathVariable long id, Model model) {
        idFromScoreRoleRelease = id;
        return FebsUtil.view("modules/mallMember/scoreRoleReleaseList");
    }


    /**
     * 业绩释放记录-列表
     * @return
     */
    @GetMapping("scoreAchieveRelease")
    @RequiresPermissions("scoreAchieveRelease:view")
    public String scoreAchieveRelease() {
        return FebsUtil.view("modules/mallMember/scoreAchieveRelease");
    }

    /**
     * 业绩释放记录-全部记录
     * @param id
     * @param model
     * @return
     */
    @GetMapping("scoreAchieveReleaseList/{id}")
    public String scoreAchieveReleaseList(@PathVariable long id, Model model) {
        idFromScoreAchieveRelease = id;
        return FebsUtil.view("modules/mallMember/scoreAchieveReleaseList");
    }


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

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

    @GetMapping("teamList/{type}/{inviteId}")
    public String teamListByInviteId(@PathVariable(value = "inviteId") String inviteId, @PathVariable("type") Integer type, Model model) {
        model.addAttribute("refererId", inviteId);
        model.addAttribute("type", type);
        return FebsUtil.view("modules/mallMember/teamList");
    }


}