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 | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 56 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 aee528c..6d8f655 100644 --- a/src/main/java/cc/mrbird/febs/mall/controller/ViewSystemController.java +++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewSystemController.java @@ -3,10 +3,13 @@ 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.AdminAgentAmountDto; +import cc.mrbird.febs.mall.dto.AdminAgentDetailDto; import cc.mrbird.febs.mall.dto.CashOutSettingDto; import cc.mrbird.febs.mall.dto.ScoreSettingDto; import cc.mrbird.febs.mall.entity.DataDictionaryCustom; import cc.mrbird.febs.mall.mapper.DataDictionaryCustomMapper; +import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import org.apache.shiro.authz.annotation.RequiresPermissions; @@ -37,4 +40,57 @@ } return FebsUtil.view("modules/system/cashOutSetting"); } + + @GetMapping("agentAmountSet") + @RequiresPermissions("agentAmountSet:update") + 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()); + DataDictionaryCustom chargeAmountDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.CHARGE_AMOUNT.getType(), + DataDictionaryEnum.CHARGE_AMOUNT.getCode()); + AdminAgentAmountDto adminAgentAmountDto = new AdminAgentAmountDto(); + if (dic != null) { + adminAgentAmountDto.setAgentAmountValue(dic.getValue()); + } + if (giveStateDic != null) { + adminAgentAmountDto.setGiveState(giveStateDic.getValue()); + } + if (activityBulletinDic != null) { + adminAgentAmountDto.setActivityBulletin(activityBulletinDic.getValue()); + } + 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"); + } + + @GetMapping("agentDetail") + @RequiresPermissions("agentDetail:update") + public String agentDetail(Model model) { + DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.AGENT_DETAILS.getType(), + DataDictionaryEnum.AGENT_DETAILS.getCode()); + AdminAgentDetailDto adminAgentDetailDto = new AdminAgentDetailDto(); + if (ObjectUtil.isNotEmpty(dic)) { + adminAgentDetailDto.setAgentDetail(dic.getValue()); + model.addAttribute("agentDetail", adminAgentDetailDto); + } + return FebsUtil.view("modules/system/agentDetail"); + } } -- Gitblit v1.9.1