From 70b8b5feba16d3ef11441c3ee9878420df3fdf37 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Tue, 25 Mar 2025 19:23:19 +0800
Subject: [PATCH] perf(mall): 移除会员利润计算中的异步执行

---
 src/main/java/cc/mrbird/febs/mall/controller/ViewSystemController.java |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 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..6d8f655 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ViewSystemController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewSystemController.java
@@ -52,6 +52,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());
@@ -65,6 +67,16 @@
         if (giveAmountDic != null) {
             adminAgentAmountDto.setGiveAmount(giveAmountDic.getValue());
         }
+        if (chargeAmountDic != null) {
+            adminAgentAmountDto.setChargeAmount(chargeAmountDic.getValue());
+        }
+        DataDictionaryCustom minAmountDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+                DataDictionaryEnum.MIN_AMOUNT_IS_MEMBER.getType(),
+                DataDictionaryEnum.MIN_AMOUNT_IS_MEMBER.getCode());
+
+        if (minAmountDic != null) {
+            adminAgentAmountDto.setMinAmount(minAmountDic.getValue());
+        }
         model.addAttribute("agentAmountSet", adminAgentAmountDto);
         return FebsUtil.view("modules/system/agentAmountSet");
     }

--
Gitblit v1.9.1