From 6cc8184be906d395e1c9dec2e3bf4d32ed14458a Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Thu, 18 Jul 2024 14:08:19 +0800
Subject: [PATCH] 逻辑

---
 src/main/java/cc/mrbird/febs/dapp/controller/ViewController.java |   35 +++++++++++++++--------------------
 1 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/dapp/controller/ViewController.java b/src/main/java/cc/mrbird/febs/dapp/controller/ViewController.java
index ddb28f3..9913912 100644
--- a/src/main/java/cc/mrbird/febs/dapp/controller/ViewController.java
+++ b/src/main/java/cc/mrbird/febs/dapp/controller/ViewController.java
@@ -7,9 +7,7 @@
 import cc.mrbird.febs.dapp.entity.DataDictionaryCustom;
 import cc.mrbird.febs.dapp.enumerate.DataDictionaryEnum;
 import cc.mrbird.febs.dapp.mapper.DataDictionaryCustomMapper;
-import cc.mrbird.febs.dapp.service.DappMemberService;
 import cc.mrbird.febs.dapp.vo.AdminSystemFeeVo;
-import cn.hutool.core.util.ObjectUtil;
 import lombok.RequiredArgsConstructor;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.stereotype.Controller;
@@ -21,7 +19,7 @@
 import java.math.BigDecimal;
 
 /**
- * @author 
+ * @author
  * @date 2022-03-21
  **/
 @Controller("dappView")
@@ -114,7 +112,7 @@
     }
 
 
-    @GetMapping(value ="priceSetting")
+    @GetMapping(value = "priceSetting")
     @RequiresPermissions("price:setting:view")
     public String priceSetting(Model model) {
         BigDecimal price = (BigDecimal) redisUtils.get(AppContants.REDIS_KEY_ETH_NEW_PRICE);
@@ -123,25 +121,22 @@
     }
 
     //费率设置
-    @GetMapping(value ="systemFeeSet")
+    @GetMapping(value = "systemFeeSet")
     @RequiresPermissions("fee:setting:view")
     public String systemFeeSet(Model model) {
         AdminSystemFeeVo adminSystemFeeVo = new AdminSystemFeeVo();
-        DataDictionaryCustom rebateDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.REBATE_PERCENT.getType(), DataDictionaryEnum.REBATE_PERCENT.getCode());
-        if(ObjectUtil.isNotEmpty(rebateDic)){
-            String value = rebateDic.getValue() == null ? "0":rebateDic.getValue();
-            adminSystemFeeVo.setRebatePercent(value);
-        }
-        DataDictionaryCustom memberFeeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.MEMBER_FEE.getType(), DataDictionaryEnum.MEMBER_FEE.getCode());
-        if(ObjectUtil.isNotEmpty(memberFeeDic)){
-            String value = memberFeeDic.getValue() == null ? "0":memberFeeDic.getValue();
-            adminSystemFeeVo.setMemberFee(value);
-        }
-        DataDictionaryCustom serviceFeeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.WITHDRAW_SERVICE_FEE.getType(), DataDictionaryEnum.WITHDRAW_SERVICE_FEE.getCode());
-        if(ObjectUtil.isNotEmpty(serviceFeeDic)){
-            String value = serviceFeeDic.getValue() == null ? "0":serviceFeeDic.getValue();
-            adminSystemFeeVo.setServiceFee(value);
-        }
+
+
+        DataDictionaryCustom dataDictionaryCustom = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+                DataDictionaryEnum.FEE_ADDRESS_KEY.getType(),
+                DataDictionaryEnum.FEE_ADDRESS_KEY.getCode());
+        adminSystemFeeVo.setAddressKey(dataDictionaryCustom.getValue());
+
+        DataDictionaryCustom addressDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+                DataDictionaryEnum.FEE_ADDRESS.getType(),
+                DataDictionaryEnum.FEE_ADDRESS.getCode());
+        adminSystemFeeVo.setAddress(addressDic.getValue());
+
         model.addAttribute("systemFee", adminSystemFeeVo);
         return FebsUtil.view("dapp/system-fee-set");
     }

--
Gitblit v1.9.1