From 1a66508ad3d73dcc456162c553b03f2208570b51 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 31 Aug 2022 16:15:54 +0800
Subject: [PATCH] 20220822
---
src/main/java/cc/mrbird/febs/mall/controller/ViewMallTeamLeaderController.java | 32 ++++++++++++++------------------
1 files changed, 14 insertions(+), 18 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallTeamLeaderController.java b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallTeamLeaderController.java
index ed1ab23..18c4ba6 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallTeamLeaderController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallTeamLeaderController.java
@@ -5,11 +5,10 @@
import cc.mrbird.febs.common.enumerates.DataDictionaryEnum;
import cc.mrbird.febs.common.utils.FebsUtil;
import cc.mrbird.febs.mall.entity.DataDictionaryCustom;
-import cc.mrbird.febs.mall.service.IAdminMallOrderService;
+import cc.mrbird.febs.mall.mapper.DataDictionaryCustomMapper;
import cc.mrbird.febs.mall.service.IAdminMallTeamLeaderService;
-import cc.mrbird.febs.mall.vo.AdminMallOrderVo;
+import cc.mrbird.febs.mall.vo.AdminLeaderBonusSettingVo;
import cc.mrbird.febs.mall.vo.AdminMallTeamLeaderVo;
-import cc.mrbird.febs.mall.vo.AdminRangeSettingVo;
import cn.hutool.core.util.ObjectUtil;
import lombok.RequiredArgsConstructor;
import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -25,6 +24,7 @@
public class ViewMallTeamLeaderController extends BaseController {
private final IAdminMallTeamLeaderService iAdminMallTeamLeaderService;
+ private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
/**
* 团长信息--列表
@@ -71,20 +71,16 @@
*/
@GetMapping("/leaderBonusSetting")
public String deliverySetting(Model model) {
-// AdminRangeSettingVo adminRangeSettingVo = new AdminRangeSettingVo();
-// DataDictionaryCustom deliverySetting = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.HOME_DELIVERY_AMOUNT.getType(), DataDictionaryEnum.HOME_DELIVERY_AMOUNT.getCode());
-// if (ObjectUtil.isNotNull(deliverySetting)) {
-// adminRangeSettingVo.setHomeDeliveryAmount(Double.parseDouble(deliverySetting.getValue()));
-// }
-// DataDictionaryCustom rangeSwitch = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.RANGE_SWITCH.getType(), DataDictionaryEnum.RANGE_SWITCH.getCode());
-// if (ObjectUtil.isNotNull(rangeSwitch)) {
-// adminRangeSettingVo.setRangeSwitch(Integer.parseInt(rangeSwitch.getValue()));
-// }
-// DataDictionaryCustom rangeSize = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.RANGE_SIZE.getType(), DataDictionaryEnum.RANGE_SIZE.getCode());
-// if (ObjectUtil.isNotNull(rangeSize)) {
-// adminRangeSettingVo.setRangeSize(Integer.parseInt(rangeSize.getValue()));
-// }
-// model.addAttribute("deliverySetting", adminRangeSettingVo);
- return FebsUtil.view("modules/goods/deliverySetting");
+ AdminLeaderBonusSettingVo adminLeaderBonusSettingVo = new AdminLeaderBonusSettingVo();
+ DataDictionaryCustom bonusSwitch = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.BONUS_SWITCH.getType(), DataDictionaryEnum.BONUS_SWITCH.getCode());
+ if (ObjectUtil.isNotNull(bonusSwitch)) {
+ adminLeaderBonusSettingVo.setBonusSwitch(Integer.parseInt(bonusSwitch.getValue()));
+ }
+ DataDictionaryCustom bonusPercent = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.BONUS_PERCENT.getType(), DataDictionaryEnum.BONUS_PERCENT.getCode());
+ if (ObjectUtil.isNotNull(bonusPercent)) {
+ adminLeaderBonusSettingVo.setBonusPercent(Double.parseDouble(bonusSwitch.getValue()));
+ }
+ model.addAttribute("leaderBonusSetting", adminLeaderBonusSettingVo);
+ return FebsUtil.view("modules/leader/leaderBonusSetting");
}
}
--
Gitblit v1.9.1