From e94e6721a4aeb8c21e97878239ec3429fc76d1ad Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 08 May 2023 14:23:45 +0800
Subject: [PATCH] 创建订单之前的判断修改
---
src/main/java/cc/mrbird/febs/mall/controller/ViewSystemController.java | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 48 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..7e5e601 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ViewSystemController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewSystemController.java
@@ -215,6 +215,20 @@
String agentPerk = ObjectUtil.isEmpty(agentPerkDic.getValue()) ? "0" : agentPerkDic.getValue();
hlmBasicPerkDto.setAgentPerk(agentPerk);
}
+ DataDictionaryCustom perkAgentAchieveTotalDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.PERK_AGENT_ACHIEVE_TOTAL.getType(),
+ DataDictionaryEnum.PERK_AGENT_ACHIEVE_TOTAL.getCode());
+ if (perkAgentAchieveTotalDic != null) {
+ String perkAgentAchieveTotal = ObjectUtil.isEmpty(perkAgentAchieveTotalDic.getValue()) ? "0" : perkAgentAchieveTotalDic.getValue();
+ hlmBasicPerkDto.setPerkAgentAchieveTotal(perkAgentAchieveTotal);
+ }
+ DataDictionaryCustom perkAgentAchievePercentDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.PERK_AGENT_ACHIEVE_PERCENT.getType(),
+ DataDictionaryEnum.PERK_AGENT_ACHIEVE_PERCENT.getCode());
+ if (perkAgentAchievePercentDic != null) {
+ String perkAgentAchievePercent = ObjectUtil.isEmpty(perkAgentAchievePercentDic.getValue()) ? "0" : perkAgentAchievePercentDic.getValue();
+ hlmBasicPerkDto.setPerkAgentAchievePercent(perkAgentAchievePercent);
+ }
model.addAttribute("hlmBasicPerk", hlmBasicPerkDto);
return FebsUtil.view("modules/system/hlmBasicPerk");
}
@@ -255,6 +269,13 @@
if (achieveReleasePercentDic != null) {
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(),
@@ -325,7 +346,34 @@
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");
}
+
+ /**
+ * 一键释放业绩
+ * @param model
+ * @return
+ */
+ @GetMapping("hlmAchieveSet")
+ @RequiresPermissions("hlmAchieveSet:view")
+ public String hlmAchieveSetButton(Model model) {
+ HlmVoucherButtonDto hlmVoucherButtonDto = new HlmVoucherButtonDto();
+ DataDictionaryCustom jobAchieveReleasePercentDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ GreenScoreEnum.JOB_ACHIEVE_RELEASE_PERCENT.getType(),
+ GreenScoreEnum.JOB_ACHIEVE_RELEASE_PERCENT.getCode());
+ if (jobAchieveReleasePercentDic != null) {
+ String jobAchieveReleasePercent = ObjectUtil.isEmpty(jobAchieveReleasePercentDic.getValue()) ? "0" : jobAchieveReleasePercentDic.getValue();
+ hlmVoucherButtonDto.setJobAchieveReleasePercent(jobAchieveReleasePercent);
+ }
+ model.addAttribute("hlmAchieveSet", hlmVoucherButtonDto);
+ return FebsUtil.view("modules/system/hlmAchieveSet");
+ }
}
--
Gitblit v1.9.1