From fcc1ced7adbaf3338c1e68b0c90275dfae14b4f8 Mon Sep 17 00:00:00 2001 From: KKSU <15274802129@163.com> Date: Mon, 17 Feb 2025 10:45:57 +0800 Subject: [PATCH] test: 更新测试用例中的运单编号 --- src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java | 38 ++++++++++++++++++++++++++++++++++++-- 1 files changed, 36 insertions(+), 2 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java index 09bfe1a..1caebf6 100644 --- a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java +++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java @@ -9,6 +9,7 @@ import cc.mrbird.febs.mall.mapper.MallSalesmanMapper; import cc.mrbird.febs.mall.service.IAdminMallMemberService; import cc.mrbird.febs.mall.vo.*; +import cn.hutool.core.util.ObjectUtil; import lombok.RequiredArgsConstructor; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.stereotype.Controller; @@ -16,6 +17,9 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; + +import java.util.HashMap; +import java.util.Map; @Controller("mallMemberView") @RequestMapping(FebsConstant.VIEW_PREFIX + "modules/mallMember") @@ -75,7 +79,7 @@ @GetMapping("mallSystemPay/{type}/{id}") @RequiresPermissions("mallSystemPay:update") public String systemPay(@PathVariable long id, @PathVariable Integer type, Model model) { - MallMemberVo data = mallMemberService.getMallMemberInfoById(id); + MallMemberVo data = mallMemberService.getMallMemberWalletById(id); model.addAttribute("systemPay", data); model.addAttribute("type", type); return FebsUtil.view("modules/mallMember/mallSystemPay"); @@ -261,7 +265,13 @@ @GetMapping("updateReferer/{id}") public String updateReferer(@PathVariable("id") Long id, Model model) { MallMember member = mallMemberService.getById(id); - model.addAttribute("referer", mallMemberService.findByInviteId(member.getReferrerId())); + MallMember byInviteId = null; + byInviteId = mallMemberService.findByInviteId(member.getReferrerId()); + if(ObjectUtil.isEmpty(byInviteId)){ + byInviteId = new MallMember(); + byInviteId.setName("无推荐人"); + } + model.addAttribute("referer", byInviteId); model.addAttribute("id", id); return FebsUtil.view("modules/mallMember/updateRefererId"); } @@ -392,5 +402,29 @@ return FebsUtil.view("modules/mallMember/couponSelect"); } + @GetMapping("vipLevelSetting/{id}") + public String vipLevelSetting(@PathVariable(value = "id") String id, Model model) { + MallMember mallMember = mallMemberMapper.selectById(id); + + Map<String, Object> data = new HashMap<>(); + data.put("id", mallMember.getId()); + data.put("level", mallMember.getLevel()); + model.addAttribute("vipLevelSet", data); + return FebsUtil.view("modules/mallMember/vip-level-setting"); + } + + @GetMapping("addCoupon/{id}") + public String addCoupon(@PathVariable long id, Model model) { +// AdminAgentLevelSetInfoVo data = mallMemberService.getAgentLevelSetInfoByMemberId(id); + model.addAttribute("memberId", id); + return FebsUtil.view("modules/mallMember/member-coupon-select"); + } + + + @GetMapping("memberBenefitsList") + @RequiresPermissions("memberBenefitsList:view") + public String memberBenefitsList() { + return FebsUtil.view("modules/mallMember/memberBenefitsList"); + } } -- Gitblit v1.9.1