From 9cf47e10044ecb29669dec48d8b649b4fb46898f Mon Sep 17 00:00:00 2001 From: Hentua <wangdoubleone@gmail.com> Date: Sun, 04 Jun 2023 00:51:54 +0800 Subject: [PATCH] fix --- src/main/java/cc/mrbird/febs/mall/controller/ViewSystemController.java | 18 ++++++++++++++++++ 1 files changed, 18 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 3d2d302..a76379b 100644 --- a/src/main/java/cc/mrbird/febs/mall/controller/ViewSystemController.java +++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewSystemController.java @@ -46,6 +46,10 @@ public String profitSetting() { return FebsUtil.view("modules/system/profitSetting"); } + @GetMapping("bonusSetting") + public String bonusSetting() { + return FebsUtil.view("modules/system/bonusSetting"); + } /** * 积分设置 @@ -256,6 +260,13 @@ String achieveReleasePercent = ObjectUtil.isEmpty(achieveReleasePercentDic.getValue()) ? "0" : achieveReleasePercentDic.getValue(); hlmVoucherSetDto.setAchieveReleasePercent(achieveReleasePercent); } + DataDictionaryCustom achieveReleaseDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode( + GreenScoreEnum.ACHIEVE_RELEASE.getType(), + GreenScoreEnum.ACHIEVE_RELEASE.getCode()); + if (achieveReleaseDic != null) { + String achieveRelease = ObjectUtil.isEmpty(achieveReleaseDic.getValue()) ? "0" : achieveReleaseDic.getValue(); + hlmVoucherSetDto.setAchieveRelease(achieveRelease); + } DataDictionaryCustom achieveMaxDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode( GreenScoreEnum.ACHIEVE_MAX.getType(), GreenScoreEnum.ACHIEVE_MAX.getCode()); @@ -325,6 +336,13 @@ String voucherOnOff = ObjectUtil.isEmpty(voucherOnOffDic.getValue()) ? "0" : voucherOnOffDic.getValue(); hlmVoucherButtonDto.setVoucherOnOff(voucherOnOff); } + DataDictionaryCustom voucherPercentDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode( + GreenScoreEnum.VOUCHER_PERCENT.getType(), + GreenScoreEnum.VOUCHER_PERCENT.getCode()); + if (voucherPercentDic != null) { + String voucherPercent = ObjectUtil.isEmpty(voucherPercentDic.getValue()) ? "0" : voucherPercentDic.getValue(); + hlmVoucherButtonDto.setVoucherPercent(voucherPercent); + } model.addAttribute("hlmVoucherButtonDto", hlmVoucherButtonDto); return FebsUtil.view("modules/system/hlmVoucherButton"); } -- Gitblit v1.9.1