From 62fcbc4dda69e739f05d547cd0b9a042004186b4 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 27 Nov 2023 15:05:03 +0800
Subject: [PATCH] 匹配

---
 src/main/java/cc/mrbird/febs/mall/controller/ViewNewsController.java |   73 ++++++++++++++++++++++++++++++++++--
 1 files changed, 69 insertions(+), 4 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 12dc11c..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,14 +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.MallProductBuy;
-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;
@@ -29,6 +32,8 @@
     private final IMallNewsInfoService mallNewsInfoService;
     private final MallProductNftMapper mallProductNftMapper;
     private final MallProductBuyMapper mallProductBuyMapper;
+    private final MallProductBuyRecordMapper mallProductBuyRecordMapper;
+    private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
 
     /**
      * NFT预约产品
@@ -70,6 +75,15 @@
     }
 
     /**
+     * 用户NFT预约列表
+     */
+    @GetMapping("productBuyListNew")
+    @RequiresPermissions("productBuyListNew:view")
+    public String productBuyListNew() {
+        return FebsUtil.view("modules/news/productBuyListNew");
+    }
+
+    /**
      * 用户NFT提现列表
      */
     @GetMapping("productSellList")
@@ -90,6 +104,57 @@
         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