From 2ae7d73e29010a1f1b43c3b71f6789c16c2c3128 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 19 May 2025 14:39:09 +0800
Subject: [PATCH] fix(mall): 修复完善信息赠送新人礼逻辑
---
src/main/java/cc/mrbird/febs/mall/controller/ViewSystemController.java | 67 +++++++++++++++++++++++++++++++--
1 files changed, 63 insertions(+), 4 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ViewSystemController.java b/src/main/java/cc/mrbird/febs/mall/controller/ViewSystemController.java
index 229fa6c..6067990 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ViewSystemController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewSystemController.java
@@ -1,12 +1,10 @@
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.AdminAgentAmountDto;
-import cc.mrbird.febs.mall.dto.AdminAgentDetailDto;
-import cc.mrbird.febs.mall.dto.CashOutSettingDto;
-import cc.mrbird.febs.mall.dto.ScoreSettingDto;
+import cc.mrbird.febs.mall.dto.*;
import cc.mrbird.febs.mall.entity.DataDictionaryCustom;
import cc.mrbird.febs.mall.mapper.DataDictionaryCustomMapper;
import cn.hutool.core.util.ObjectUtil;
@@ -52,6 +50,8 @@
DataDictionaryEnum.ACTIVITY_BULLETIN.getCode());
DataDictionaryCustom giveAmountDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.GIVE_AMOUNT.getType(),
DataDictionaryEnum.GIVE_AMOUNT.getCode());
+ DataDictionaryCustom chargeAmountDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.CHARGE_AMOUNT.getType(),
+ DataDictionaryEnum.CHARGE_AMOUNT.getCode());
AdminAgentAmountDto adminAgentAmountDto = new AdminAgentAmountDto();
if (dic != null) {
adminAgentAmountDto.setAgentAmountValue(dic.getValue());
@@ -64,6 +64,9 @@
}
if (giveAmountDic != null) {
adminAgentAmountDto.setGiveAmount(giveAmountDic.getValue());
+ }
+ if (chargeAmountDic != null) {
+ adminAgentAmountDto.setChargeAmount(chargeAmountDic.getValue());
}
model.addAttribute("agentAmountSet", adminAgentAmountDto);
return FebsUtil.view("modules/system/agentAmountSet");
@@ -81,4 +84,60 @@
}
return FebsUtil.view("modules/system/agentDetail");
}
+
+
+
+ @GetMapping("indexVideo")
+ @RequiresPermissions("indexVideo:update")
+ public String indexVideoSet(Model model) {
+ DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.VIDEO_URL_INDEX.getType(),
+ DataDictionaryEnum.VIDEO_URL_INDEX.getCode());
+ AdminIndexVideoDto adminIndexVideoDto = new AdminIndexVideoDto();
+ if (ObjectUtil.isNotEmpty(dic)) {
+ adminIndexVideoDto.setVideoUrl(dic.getValue());
+ }
+ model.addAttribute("indexVideoSet", adminIndexVideoDto);
+ return FebsUtil.view("modules/system/indexVideo");
+ }
+
+ @GetMapping("indexPng")
+ @RequiresPermissions("indexPng:update")
+ public String indexPngSet(Model model) {;
+ AdminIndexVideoDto adminIndexVideoDto = new AdminIndexVideoDto();
+// DataDictionaryCustom pngDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+// CommonDictionaryEnum.PNG_URL_INDEX.getType(),
+// CommonDictionaryEnum.PNG_URL_INDEX.getCode())
+// if (ObjectUtil.isNotEmpty(pngDic)) {
+// adminIndexVideoDto.setPngUrl(pngDic.getValue());
+// }
+ DataDictionaryCustom timeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ CommonDictionaryEnum.TIME_URL_INDEX.getType(),
+ CommonDictionaryEnum.TIME_URL_INDEX.getCode());
+ if (ObjectUtil.isNotEmpty(timeDic)) {
+ adminIndexVideoDto.setTimeStop(timeDic.getValue());
+ }
+ model.addAttribute("adminIndexVideoDto", adminIndexVideoDto);
+ return FebsUtil.view("modules/system/indexPng");
+ }
+
+
+
+ @GetMapping("faPiao")
+ @RequiresPermissions("faPiao:update")
+ public String faPiao(Model model) {
+ FaPiaoDto faPiaoDto = new FaPiaoDto();
+ DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.FP_CALLBACK_URL.getType(),
+ DataDictionaryEnum.FP_CALLBACK_URL.getCode());
+ if (dic != null) {
+ faPiaoDto.setCallbackUrl(dic.getValue());
+ }
+ model.addAttribute("faPiaoDto", faPiaoDto);
+ return FebsUtil.view("modules/system/faPiao");
+ }
+
+ @GetMapping("vipCenterSetting")
+ public String vipCenterSetting() {
+ return FebsUtil.view("modules/system/vipCenterSetting");
+ }
}
--
Gitblit v1.9.1