From 6e930b85e4ef92a0a6170cbb8f2da930bbcc72e9 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 02 Mar 2023 15:57:51 +0800
Subject: [PATCH] 增加活动公告

---
 src/main/java/cc/mrbird/febs/mall/controller/AdminSystemController.java |   24 +++++++++++++++++++++---
 1 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/controller/AdminSystemController.java b/src/main/java/cc/mrbird/febs/mall/controller/AdminSystemController.java
index 9ca3b6f..b3e0dec 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminSystemController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminSystemController.java
@@ -1,5 +1,6 @@
 package cc.mrbird.febs.mall.controller;
 
+import cc.mrbird.febs.common.annotation.ControllerEndpoint;
 import cc.mrbird.febs.common.entity.FebsResponse;
 import cc.mrbird.febs.common.enumerates.DataDictionaryEnum;
 import cc.mrbird.febs.mall.dto.AdminAgentAmountDto;
@@ -75,14 +76,28 @@
             return new FebsResponse().fail().message("请刷新页面重试");
         }
 
+        DataDictionaryCustom chargeAmountDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.CHARGE_AMOUNT.getType(),
+                DataDictionaryEnum.CHARGE_AMOUNT.getCode());
+        if(ObjectUtil.isEmpty(chargeAmountDic)){
+            return new FebsResponse().fail().message("请刷新页面重试");
+        }
+
         String giveState = adminAgentAmountDto.getGiveState();
         if(1 == Integer.parseInt(giveState)){
             if(ObjectUtil.isEmpty(adminAgentAmountDto.getActivityBulletin())){
                 return new FebsResponse().fail().message("活动公告不能为空");
             }
-            if(ObjectUtil.isEmpty(adminAgentAmountDto.getActivityBulletin())
-            || BigDecimal.ZERO.compareTo(new BigDecimal(adminAgentAmountDto.getActivityBulletin())) > 0){
+            if(ObjectUtil.isEmpty(adminAgentAmountDto.getGiveAmount())){
                 return new FebsResponse().fail().message("请输入正确的赠送金额");
+            }
+            if(BigDecimal.ZERO.compareTo(new BigDecimal(adminAgentAmountDto.getGiveAmount())) > 0){
+                return new FebsResponse().fail().message("请输入正确的赠送金额");
+            }
+            if(ObjectUtil.isEmpty(adminAgentAmountDto.getChargeAmount())){
+                return new FebsResponse().fail().message("请输入正确的充值金额");
+            }
+            if(BigDecimal.ZERO.compareTo(new BigDecimal(adminAgentAmountDto.getChargeAmount())) > 0){
+                return new FebsResponse().fail().message("请输入正确的充值金额");
             }
         }
 
@@ -98,7 +113,10 @@
         giveAmountDic.setValue(adminAgentAmountDto.getGiveAmount());
         dataDictionaryCustomMapper.updateById(giveAmountDic);
 
-        return new FebsResponse().success();
+        chargeAmountDic.setValue(adminAgentAmountDto.getChargeAmount());
+        dataDictionaryCustomMapper.updateById(chargeAmountDic);
+
+        return new FebsResponse().success().message("操作成功");
     }
 
     @PostMapping(value = "/agentDetail")

--
Gitblit v1.9.1