From 3e3e54ccd6b95746f854ed27073d73b35d64e122 Mon Sep 17 00:00:00 2001 From: Administrator <15274802129@163.com> Date: Thu, 15 May 2025 11:26:01 +0800 Subject: [PATCH] feat(mall): 新增新人礼弹窗逻辑 --- src/main/java/cc/mrbird/febs/mall/controller/ViewScoreController.java | 61 ++++++++++++++++++++++++++++++ 1 files changed, 61 insertions(+), 0 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ViewScoreController.java b/src/main/java/cc/mrbird/febs/mall/controller/ViewScoreController.java index 14ec623..8379e16 100644 --- a/src/main/java/cc/mrbird/febs/mall/controller/ViewScoreController.java +++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewScoreController.java @@ -1,18 +1,26 @@ package cc.mrbird.febs.mall.controller; import cc.mrbird.febs.common.entity.FebsConstant; +import cc.mrbird.febs.common.enumerates.CommonDictionaryEnum; import cc.mrbird.febs.common.enumerates.DataDictionaryEnum; import cc.mrbird.febs.common.utils.FebsUtil; import cc.mrbird.febs.mall.dto.ScoreSettingDto; +import cc.mrbird.febs.mall.dto.signActivity.ApiNewGiftSettingDto; import cc.mrbird.febs.mall.entity.DataDictionaryCustom; +import cc.mrbird.febs.mall.entity.MallGoods; import cc.mrbird.febs.mall.mapper.DataDictionaryCustomMapper; +import cc.mrbird.febs.mall.mapper.MallGoodsImagesMapper; +import cc.mrbird.febs.mall.service.impl.AdminMallGoodsService; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; + +import java.util.List; @Controller("scoreView") @RequestMapping(FebsConstant.VIEW_PREFIX + "modules/score") @@ -20,6 +28,8 @@ public class ViewScoreController { private final DataDictionaryCustomMapper dataDictionaryCustomMapper; + private final AdminMallGoodsService mallGoodsService; + private final MallGoodsImagesMapper mallGoodsImagesMapper; @GetMapping("setting") // @RequiresPermissions("orderList:view") @@ -30,4 +40,55 @@ } return FebsUtil.view("modules/score/setting"); } + + + /** + * 新人礼设置 + * @param model + * @return + */ + @GetMapping("newGiftSetting") + public String newGiftSetting(Model model) { + DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode( + CommonDictionaryEnum.NEW_GIFT_SETTING.getType(), + CommonDictionaryEnum.NEW_GIFT_SETTING.getCode() + ); + if (dic != null) { + model.addAttribute("obj", JSONObject.parseObject(dic.getValue(), ApiNewGiftSettingDto.class)); + } + return FebsUtil.view("modules/score/newGiftSetting"); + } + + @GetMapping("goods") + public String goodsList() { + return FebsUtil.view("modules/score/goodsList"); + } + + @GetMapping("goods/add") + public String goodsAdd() { + return FebsUtil.view("modules/score/goodsAdd"); + } + + @GetMapping("goods/update/{id}") + public String goodsUpdate(@PathVariable("id") Long id, Model model) { + MallGoods mallGoods = mallGoodsService.selectGoodsById(id); + + List<String> images = mallGoodsImagesMapper.selectByGoodId(mallGoods.getId()); + mallGoods.setImages(images); + + model.addAttribute("scoreGoods", mallGoods); + return FebsUtil.view("modules/score/goodsUpdate"); + } + + @GetMapping(value = "/order/list") + @RequiresPermissions("score:order:list") + public String orderList() { + return FebsUtil.view("modules/score/orderList"); + } + + @GetMapping(value = "/flow/list") + @RequiresPermissions("score:flow:view") + public String scoreFlow() { + return FebsUtil.view("modules/score/moneyFlowList"); + } } -- Gitblit v1.9.1