fix

Hentua

2023-06-15 1d0d712b4f2b489e020cbf23eaf20e386eee1561

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

@@ -16,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")
@@ -27,6 +30,10 @@
    public static long idFromMoneyFlow;

    public static long idFromAgentAllMember;

    public static long idFromScoreRoleRelease;

    public static long idFromScoreAchieveRelease;

    /**
     * 平台账单
@@ -49,6 +56,16 @@
    }

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

    /**
     * 会员列表-个人详情
     * @param id
     * @param model
@@ -68,12 +85,28 @@
     * @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");
    }

    /**
     * 会员列表-系统拨付绿色凭证
     * @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");
    }

    /**
@@ -83,6 +116,7 @@
     * @return
     */
    @GetMapping("moneyFlow/{id}")
    @RequiresPermissions("moneyFlow:update")
    public String moneyFlow(@PathVariable long id, Model model) {
        idFromMoneyFlow = id;
        return FebsUtil.view("modules/mallMember/moneyFlow");
@@ -94,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");
    }

@@ -117,7 +153,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");
    }
@@ -130,6 +167,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");
    }

    /**
@@ -166,6 +213,18 @@
    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");
    }

    /**
@@ -240,41 +299,6 @@
        return FebsUtil.view("modules/mallMember/appVerSionUpdate");
    }

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

    /**
     * 新闻中心-新增
     * @return
     */
    @GetMapping("newsInfoAdd")
    @RequiresPermissions("newsInfoAdd:add")
    public String newsInfoAdd() {
        return FebsUtil.view("modules/mallMember/newsInfoAdd");
    }

    /**
     * 新闻中心-详情
     * @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("shopApply")
    public String shopApply() {
@@ -288,7 +312,84 @@
        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");
    }


}