From bc26bbd27b75ab2f8ffc79a5a5fe25206f15abc7 Mon Sep 17 00:00:00 2001 From: KKSU <15274802129@163.com> Date: Tue, 28 Nov 2023 17:39:07 +0800 Subject: [PATCH] 匹配 --- src/main/java/cc/mrbird/febs/mall/controller/ViewNewsController.java | 86 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 83 insertions(+), 3 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ViewNewsController.java b/src/main/java/cc/mrbird/febs/mall/controller/ViewNewsController.java index c16302a..4669428 100644 --- a/src/main/java/cc/mrbird/febs/mall/controller/ViewNewsController.java +++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewNewsController.java @@ -1,12 +1,17 @@ package cc.mrbird.febs.mall.controller; import cc.mrbird.febs.common.entity.FebsConstant; +import cc.mrbird.febs.common.enumerates.DataDictionaryEnum; import cc.mrbird.febs.common.utils.FebsUtil; -import cc.mrbird.febs.mall.entity.MallNewsCategory; -import cc.mrbird.febs.mall.entity.MallNewsInfo; -import cc.mrbird.febs.mall.entity.MallProductNft; +import cc.mrbird.febs.mall.dto.AdminGfaBasicSetDto; +import cc.mrbird.febs.mall.dto.HlmScoreSetDto; +import cc.mrbird.febs.mall.entity.*; +import cc.mrbird.febs.mall.mapper.DataDictionaryCustomMapper; +import cc.mrbird.febs.mall.mapper.MallProductBuyMapper; +import cc.mrbird.febs.mall.mapper.MallProductBuyRecordMapper; import cc.mrbird.febs.mall.mapper.MallProductNftMapper; import cc.mrbird.febs.mall.service.IMallNewsInfoService; +import cn.hutool.core.util.ObjectUtil; import lombok.RequiredArgsConstructor; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.stereotype.Controller; @@ -26,6 +31,9 @@ private final IMallNewsInfoService mallNewsInfoService; private final MallProductNftMapper mallProductNftMapper; + private final MallProductBuyMapper mallProductBuyMapper; + private final MallProductBuyRecordMapper mallProductBuyRecordMapper; + private final DataDictionaryCustomMapper dataDictionaryCustomMapper; /** * NFT预约产品 @@ -67,6 +75,15 @@ } /** + * 用户NFT预约列表 + */ + @GetMapping("productBuyListNew") + @RequiresPermissions("productBuyListNew:view") + public String productBuyListNew() { + return FebsUtil.view("modules/news/productBuyListNew"); + } + + /** * 用户NFT提现列表 */ @GetMapping("productSellList") @@ -76,6 +93,69 @@ } /** + * 用户NFT提现-手动分配 + * @return + */ + @GetMapping("productSellPick/{id}") + @RequiresPermissions("productSellPick:update") + public String productSellPick(@PathVariable long id, Model model) { + MallProductBuy mallProductBuy = mallProductBuyMapper.selectById(id); + model.addAttribute("mallProductBuy", mallProductBuy); + return FebsUtil.view("modules/news/productSellPick"); + } + + + /** + * 用户预约打款记录--确认支付 + * @return + */ + @GetMapping("buyRecordPay/{id}") + @RequiresPermissions("buyRecordPay:update") + public String buyRecordPay(@PathVariable long id, Model model) { + MallProductBuyRecord mallProductBuyRecord = mallProductBuyRecordMapper.selectById(id); + model.addAttribute("mallProductBuyRecord", mallProductBuyRecord); + return FebsUtil.view("modules/news/buyRecordPay"); + } + + + /** + * 用户预约打款记录--凭证 + * @return + */ + @GetMapping("buyRecordImg/{id}") + @RequiresPermissions("buyRecordImg:update") + public String buyRecordImg(@PathVariable long id, Model model) { + MallProductBuyRecord mallProductBuyRecord = mallProductBuyRecordMapper.selectById(id); + model.addAttribute("mallProductBuyRecord", mallProductBuyRecord); + return FebsUtil.view("modules/news/buyRecordImg"); + } + + /** + * 基础设置 + * @param model + * @return + */ + @GetMapping("gfaBasicSet") + @RequiresPermissions("gfaBasicSet:view") + public String gfaBasicSet(Model model) { + AdminGfaBasicSetDto gfaBasicSetDto = new AdminGfaBasicSetDto(); + DataDictionaryCustom startTimeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode( + DataDictionaryEnum.YU_YUE_START_TIME.getType(), + DataDictionaryEnum.YU_YUE_START_TIME.getCode()); + if (startTimeDic != null) { + gfaBasicSetDto.setStartTime(startTimeDic.getValue()); + } + DataDictionaryCustom endCntDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode( + DataDictionaryEnum.YU_YUE_END_TIME.getType(), + DataDictionaryEnum.YU_YUE_END_TIME.getCode()); + if (startTimeDic != null) { + gfaBasicSetDto.setEndTime(endCntDic.getValue()); + } + model.addAttribute("gfaBasicSet", gfaBasicSetDto); + return FebsUtil.view("modules/news/gfaBasicSet"); + } + + /** * 新闻中心-列表 * @return */ -- Gitblit v1.9.1