From 05c40a68b5664c5ed41dbaa57ba30f0c73757b26 Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Tue, 25 Apr 2023 11:10:48 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/mall/controller/ViewSystemController.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 52 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 796674d..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());
@@ -291,7 +302,48 @@
String levelAchievePercent = ObjectUtil.isEmpty(levelAchievePercentDic.getValue()) ? "0" : levelAchievePercentDic.getValue();
hlmVoucherSetDto.setLevelAchievePercent(levelAchievePercent);
}
+ DataDictionaryCustom scorePoolCntDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ GreenScoreEnum.SCORE_POOL_CNT.getType(),
+ GreenScoreEnum.SCORE_POOL_CNT.getCode());
+ if (scorePoolCntDic != null) {
+ String scorePoolCnt = ObjectUtil.isEmpty(scorePoolCntDic.getValue()) ? "0" : scorePoolCntDic.getValue();
+ hlmVoucherSetDto.setScorePoolCnt(scorePoolCnt);
+ }
model.addAttribute("hlmVoucherSetDto", hlmVoucherSetDto);
return FebsUtil.view("modules/system/hlmVoucherSet");
}
+
+ /**
+ * 一键卖出
+ * @param model
+ * @return
+ */
+ @GetMapping("hlmVoucherButton")
+ @RequiresPermissions("hlmVoucherButton:view")
+ public String hlmVoucherButton(Model model) {
+ HlmVoucherButtonDto hlmVoucherButtonDto = new HlmVoucherButtonDto();
+ DataDictionaryCustom scorePriceDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ GreenScoreEnum.SCORE_PRICE.getType(),
+ GreenScoreEnum.SCORE_PRICE.getCode());
+ if (scorePriceDic != null) {
+ String scorePrice = ObjectUtil.isEmpty(scorePriceDic.getValue()) ? "0" : scorePriceDic.getValue();
+ hlmVoucherButtonDto.setScorePrice(scorePrice);
+ }
+ DataDictionaryCustom voucherOnOffDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ GreenScoreEnum.VOUCHER_ON_OFF.getType(),
+ GreenScoreEnum.VOUCHER_ON_OFF.getCode());
+ if (voucherOnOffDic != null) {
+ 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