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 | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 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 50115fe..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");
}
@@ -348,8 +362,8 @@
* @param model
* @return
*/
- @GetMapping("hlmAchieveSetButton")
- @RequiresPermissions("hlmAchieveSetButton:view")
+ @GetMapping("hlmAchieveSet")
+ @RequiresPermissions("hlmAchieveSet:view")
public String hlmAchieveSetButton(Model model) {
HlmVoucherButtonDto hlmVoucherButtonDto = new HlmVoucherButtonDto();
DataDictionaryCustom jobAchieveReleasePercentDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
--
Gitblit v1.9.1