From a56aa58c55f966c38cb8b5fc969eb1018fad5ce8 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 22 Sep 2022 16:38:13 +0800
Subject: [PATCH] 20220902
---
src/main/java/cc/mrbird/febs/mall/controller/ViewMallTeamLeaderController.java | 28 ++++++++++++++++++++++++++--
1 files changed, 26 insertions(+), 2 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 18c4ba6..c16d635 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallTeamLeaderController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallTeamLeaderController.java
@@ -5,7 +5,9 @@
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.entity.MallMember;
import cc.mrbird.febs.mall.mapper.DataDictionaryCustomMapper;
+import cc.mrbird.febs.mall.mapper.MallMemberMapper;
import cc.mrbird.febs.mall.service.IAdminMallTeamLeaderService;
import cc.mrbird.febs.mall.vo.AdminLeaderBonusSettingVo;
import cc.mrbird.febs.mall.vo.AdminMallTeamLeaderVo;
@@ -25,6 +27,7 @@
private final IAdminMallTeamLeaderService iAdminMallTeamLeaderService;
private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
+ private final MallMemberMapper mallMemberMapper;
/**
* 团长信息--列表
@@ -59,7 +62,8 @@
@GetMapping("addLeader/{id}")
public String addLeader(@PathVariable long id, Model model) {
- model.addAttribute("memberId", id);
+ MallMember mallMember = mallMemberMapper.selectById(id);
+ model.addAttribute("mallMember", mallMember);
return FebsUtil.view("modules/leader/addLeader");
}
@@ -78,9 +82,29 @@
}
DataDictionaryCustom bonusPercent = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.BONUS_PERCENT.getType(), DataDictionaryEnum.BONUS_PERCENT.getCode());
if (ObjectUtil.isNotNull(bonusPercent)) {
- adminLeaderBonusSettingVo.setBonusPercent(Double.parseDouble(bonusSwitch.getValue()));
+ adminLeaderBonusSettingVo.setBonusPercent(bonusPercent.getValue());
}
model.addAttribute("leaderBonusSetting", adminLeaderBonusSettingVo);
return FebsUtil.view("modules/leader/leaderBonusSetting");
}
+
+ /**
+ * 团长区域--电子围栏
+ */
+ @GetMapping("leaderMapSetting")
+ @RequiresPermissions("leaderMapSetting:view")
+ public String leaderMapSetting() {
+ return FebsUtil.view("modules/leader/leaderMapSetting");
+ }
+
+ /**
+ * 团长信息-电子围栏设置
+ */
+ @GetMapping("fenceAdd/{id}")
+ @RequiresPermissions("fenceAdd:add")
+ public String fenceAdd(@PathVariable long id, Model model) {
+ AdminMallTeamLeaderVo data = iAdminMallTeamLeaderService.getMallTeamLederInfoById(id);
+ model.addAttribute("leaderInfo", data);
+ return FebsUtil.view("modules/leader/leaderFenceAdd");
+ }
}
--
Gitblit v1.9.1