From ba2eebb488f3d3b2820441bc5f01bbeaf2cd4a01 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 01 Mar 2023 17:14:16 +0800
Subject: [PATCH] 增加活动公告

---
 src/main/java/cc/mrbird/febs/mall/controller/ViewSystemController.java |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 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 e4ef506..229fa6c 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ViewSystemController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewSystemController.java
@@ -46,11 +46,26 @@
     public String agentAmountSet(Model model) {
         DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.PRICE_AMOUNT.getType(),
                 DataDictionaryEnum.PRICE_AMOUNT.getCode());
+        DataDictionaryCustom giveStateDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.GIVE_STATE.getType(),
+                DataDictionaryEnum.GIVE_STATE.getCode());
+        DataDictionaryCustom activityBulletinDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.ACTIVITY_BULLETIN.getType(),
+                DataDictionaryEnum.ACTIVITY_BULLETIN.getCode());
+        DataDictionaryCustom giveAmountDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.GIVE_AMOUNT.getType(),
+                DataDictionaryEnum.GIVE_AMOUNT.getCode());
         AdminAgentAmountDto adminAgentAmountDto = new AdminAgentAmountDto();
         if (dic != null) {
             adminAgentAmountDto.setAgentAmountValue(dic.getValue());
-            model.addAttribute("agentAmountSet", adminAgentAmountDto);
         }
+        if (giveStateDic != null) {
+            adminAgentAmountDto.setGiveState(giveStateDic.getValue());
+        }
+        if (activityBulletinDic != null) {
+            adminAgentAmountDto.setActivityBulletin(activityBulletinDic.getValue());
+        }
+        if (giveAmountDic != null) {
+            adminAgentAmountDto.setGiveAmount(giveAmountDic.getValue());
+        }
+        model.addAttribute("agentAmountSet", adminAgentAmountDto);
         return FebsUtil.view("modules/system/agentAmountSet");
     }
 

--
Gitblit v1.9.1