From 664184af3e070dee665ee736caffa0297804975f Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Tue, 18 Mar 2025 11:46:02 +0800
Subject: [PATCH] perf(mall): 移除会员利润计算中的异步执行
---
src/main/java/cc/mrbird/febs/mall/controller/ViewMallTeamLeaderController.java | 70 ++++++++++++++++++++++++++++++++++-
1 files changed, 68 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 dcc8b26..c16d635 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallTeamLeaderController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallTeamLeaderController.java
@@ -2,11 +2,16 @@
import cc.mrbird.febs.common.controller.BaseController;
import cc.mrbird.febs.common.entity.FebsConstant;
+import cc.mrbird.febs.common.enumerates.DataDictionaryEnum;
import cc.mrbird.febs.common.utils.FebsUtil;
-import cc.mrbird.febs.mall.service.IAdminMallOrderService;
+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.AdminMallOrderVo;
+import cc.mrbird.febs.mall.vo.AdminLeaderBonusSettingVo;
import cc.mrbird.febs.mall.vo.AdminMallTeamLeaderVo;
+import cn.hutool.core.util.ObjectUtil;
import lombok.RequiredArgsConstructor;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.stereotype.Controller;
@@ -21,6 +26,8 @@
public class ViewMallTeamLeaderController extends BaseController {
private final IAdminMallTeamLeaderService iAdminMallTeamLeaderService;
+ private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
+ private final MallMemberMapper mallMemberMapper;
/**
* 团长信息--列表
@@ -41,4 +48,63 @@
model.addAttribute("leaderInfo", data);
return FebsUtil.view("modules/leader/leaderUpdate");
}
+
+
+ public static long idLeaderGoodsUpdate;
+ /**
+ * 团长信息-商品库存编辑
+ */
+ @GetMapping("leaderGoodsUpdate/{id}")
+ public String leaderGoodsUpdate(@PathVariable long id, Model model) {
+ idLeaderGoodsUpdate = id;
+ return FebsUtil.view("modules/leader/leaderGoodsUpdate");
+ }
+
+ @GetMapping("addLeader/{id}")
+ public String addLeader(@PathVariable long id, Model model) {
+ MallMember mallMember = mallMemberMapper.selectById(id);
+ model.addAttribute("mallMember", mallMember);
+ return FebsUtil.view("modules/leader/addLeader");
+ }
+
+
+ /**
+ * 团长每日分成
+ * @param model
+ * @return
+ */
+ @GetMapping("/leaderBonusSetting")
+ public String deliverySetting(Model model) {
+ 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(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