From 7f55c18d7db36c9cad2ac96e481680bc1107e51c Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Thu, 15 Jun 2023 11:16:11 +0800
Subject: [PATCH] Merge branch 'meiye_mall' of http://120.27.238.55:7000/r/xc-mall into meiye_mall
---
src/main/java/cc/mrbird/febs/mall/controller/ViewMallActController.java | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 insertions(+), 1 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallActController.java b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallActController.java
index 178b63c..cc10fd2 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallActController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallActController.java
@@ -2,12 +2,18 @@
import cc.mrbird.febs.common.controller.BaseController;
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.dto.LuckDrawSettingDto;
+import cc.mrbird.febs.mall.dto.ScoreSettingDto;
+import cc.mrbird.febs.mall.entity.DataDictionaryCustom;
import cc.mrbird.febs.mall.entity.MallActSet;
import cc.mrbird.febs.mall.entity.MallActWinRecord;
-import cc.mrbird.febs.mall.entity.MallGoods;
+import cc.mrbird.febs.mall.mapper.DataDictionaryCustomMapper;
import cc.mrbird.febs.mall.service.IAdminMallActService;
+import com.alibaba.fastjson.JSONObject;
import lombok.RequiredArgsConstructor;
+import cn.hutool.core.util.ObjectUtil;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
@@ -21,6 +27,8 @@
public class ViewMallActController extends BaseController {
private final IAdminMallActService iAdminMallActService;
+
+ private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
/**
* 活动-列表
@@ -71,4 +79,25 @@
return FebsUtil.view("modules/act/winRecordInfo");
}
+ /**
+ * 中奖概率设置
+ */
+ @GetMapping("setting")
+ @RequiresPermissions("luckdrawWinSet:see")
+ public String setting(Model model) {
+ DataDictionaryCustom dicScore = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.WIN_SCORE.getType(), DataDictionaryEnum.WIN_SCORE.getCode());
+ DataDictionaryCustom dicCash = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.WIN_CASH.getType(), DataDictionaryEnum.WIN_CASH.getCode());
+ LuckDrawSettingDto luckDrawSettingDto = new LuckDrawSettingDto();
+ if(ObjectUtil.isNotEmpty(dicCash)){
+ luckDrawSettingDto.setCashSet(dicCash.getValue() == null ? "0" : dicCash.getValue());
+ }
+ if(ObjectUtil.isNotEmpty(dicScore)){
+ luckDrawSettingDto.setScoreSet(dicScore.getValue() == null ? "0" : dicScore.getValue());
+ }
+ if (dicCash != null) {
+ model.addAttribute("obj", luckDrawSettingDto);
+ }
+ return FebsUtil.view("modules/act/setting");
+ }
+
}
--
Gitblit v1.9.1