From d175d1a66a53a46f182316680afd8a9bf6314ea0 Mon Sep 17 00:00:00 2001 From: KKSU <15274802129@163.com> Date: Wed, 08 Jan 2025 16:14:51 +0800 Subject: [PATCH] feat(mall): 添加优惠券相关功能 --- src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java | 220 ++++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 178 insertions(+), 42 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 8acf032..1caebf6 100644 --- a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java +++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java @@ -3,12 +3,13 @@ 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.entity.*; +import cc.mrbird.febs.mall.mapper.MallAgentRecordMapper; +import cc.mrbird.febs.mall.mapper.MallMemberMapper; +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; @@ -17,12 +18,19 @@ 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") @RequiredArgsConstructor public class ViewMallMemberController extends BaseController { private final IAdminMallMemberService mallMemberService; + + private final MallSalesmanMapper mallSalesmanMapper; + private final MallMemberMapper mallMemberMapper; + private final MallAgentRecordMapper mallAgentRecordMapper; public static long idFromMoneyFlow; @@ -68,11 +76,12 @@ * @param model * @return */ - @GetMapping("mallSystemPay/{id}") + @GetMapping("mallSystemPay/{type}/{id}") @RequiresPermissions("mallSystemPay:update") - public String systemPay(@PathVariable long id, Model model) { - MallMemberVo data = mallMemberService.getMallMemberInfoById(id); + public String systemPay(@PathVariable long id, @PathVariable Integer type, Model model) { + MallMemberVo data = mallMemberService.getMallMemberWalletById(id); model.addAttribute("systemPay", data); + model.addAttribute("type", type); return FebsUtil.view("modules/mallMember/mallSystemPay"); } @@ -240,41 +249,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 +262,169 @@ return FebsUtil.view("modules/mallMember/shopApplyInfo"); } + @GetMapping("updateReferer/{id}") + public String updateReferer(@PathVariable("id") Long id, Model model) { + MallMember member = mallMemberService.getById(id); + 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"); + } + + @GetMapping("addMember") + public String addMember() { + return FebsUtil.view("modules/mallMember/addMember"); + } + + /** + * 代理申请列表 + */ + @GetMapping("mallAgentRecord") + @RequiresPermissions("mallAgentRecord:view") + public String mallAgentRecord() { + return FebsUtil.view("modules/mallMember/mallAgentRecord"); + } + + /** + * 推销员列表 + */ + @GetMapping("mallSalesManList") + @RequiresPermissions("mallSalesManList:view") + public String mallSalesManList() { + return FebsUtil.view("modules/mallMember/mallSalesManList"); + } + + /** + * 推销员列表-新增 + */ + @GetMapping("addSalesman") + @RequiresPermissions("addSalesman:view") + public String addSalesman() { + return FebsUtil.view("modules/mallMember/addSalesman"); + } + + /** + * 推销员列表-详情 + */ + @GetMapping("salesmanUpdate/{id}") + @RequiresPermissions("salesmanUpdate:update") + public String salesmanUpdate(@PathVariable long id, Model model) { + MallSalesman mallSalesman = mallSalesmanMapper.selectById(id); + model.addAttribute("mallSalesman", mallSalesman); + return FebsUtil.view("modules/mallMember/salesmanUpdate"); + } + + /** + * 推销员列表-选择 + * @param id + * @param model + * @return + */ + @GetMapping("agentSelect/{id}") + @RequiresPermissions("agentSelect:update") + public String agentSelect(@PathVariable long id, Model model) { + AdminAgentSelectVo data = mallSalesmanMapper.agentSelect(id); + model.addAttribute("adminAgentSelectVo", data); + return FebsUtil.view("modules/mallMember/agentSelect"); + } + + /** + * 地址金额统计列表 + */ + @GetMapping("addressAmountList") + @RequiresPermissions("addressAmountList:view") + public String addressAmountList() { + return FebsUtil.view("modules/mallMember/addressAmountList"); + } + + /** + * 地址金额统计列表 + */ + @GetMapping("salesmanAchieveList") + @RequiresPermissions("salesmanAchieveList:view") + public String salesmanAchieveList() { + return FebsUtil.view("modules/mallMember/salesmanAchieveList"); + } + + /** + * 合伙人业绩列表 + */ + @GetMapping("agentAchieveList") + @RequiresPermissions("agentAchieveList:view") + public String agentAchieveList() { + return FebsUtil.view("modules/mallMember/agentAchieveList"); + } + + /** + * 合伙人代理等级列表-选择 + * @param id + * @param model + * @return + */ + @GetMapping("agentVerify/{id}") + @RequiresPermissions("agentVerify:update") + public String agentVerify(@PathVariable long id, Model model) { + MallAgentRecord mallAgentRecord = mallAgentRecordMapper.selectById(id); + AdminAgentVerifyVo data = new AdminAgentVerifyVo(); + data.setId(mallAgentRecord.getId()); + model.addAttribute("adminAgentVerifyVo", data); + return FebsUtil.view("modules/mallMember/agentVerify"); + } + + /** + * 推销员列表 + * @return + */ + @GetMapping("memberSaleman") + @RequiresPermissions("memberSaleman:view") + public String memberSaleman() { + return FebsUtil.view("modules/mallMember/memberSaleman"); + } + + /** + * 优惠卷列表-选择 + * @param id + * @param model + * @return + */ + @GetMapping("couponSelect/{id}") + @RequiresPermissions("couponSelect:update") + public String couponSelect(@PathVariable long id, Model model) { + MallMember mallMember = mallMemberMapper.selectById(id); + AdminCouponSelectVo data = new AdminCouponSelectVo(); + data.setId(mallMember.getId()); + model.addAttribute("adminCouponSelectVo", data); + 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