From df864d1d636751424fd642d3bdd33c53cf63500d Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 07 Jul 2025 17:51:09 +0800
Subject: [PATCH] feat(mall): 为活动订单项添加积分和成长值奖 - 在活动添加和编辑页面增加积分和成长值输入字段 - 更新活动实体类，添加 scoreCnt 和 growthCnt 字段 - 修改活动订单项处理逻辑，增加积分和成长值奖励的计算和发放 - 优化活动订单项状态检查逻辑，移除冗余代码
---
src/main/java/cc/mrbird/febs/mall/controller/member/ViewMallMemberController.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/member/ViewMallMemberController.java b/src/main/java/cc/mrbird/febs/mall/controller/member/ViewMallMemberController.java
index 9d9aa36..345f802 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/member/ViewMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/member/ViewMallMemberController.java
@@ -77,7 +77,7 @@
* @return
*/
@GetMapping("mallSystemPay/{type}/{id}")
- @RequiresPermissions("mallSystemPay:update")
+ @RequiresPermissions("wallet:update")
public String systemPay(@PathVariable long id, @PathVariable Integer type, Model model) {
MallMemberVo data = mallMemberService.getMallMemberInfoById(id);
model.addAttribute("systemPay", data);
@@ -403,16 +403,29 @@
}
@GetMapping("vipLevelSetting/{id}")
+ @RequiresPermissions("updateMemberLevel:update")
public String vipLevelSetting(@PathVariable(value = "id") String id, Model model) {
MallMember mallMember = mallMemberMapper.selectById(id);
Map<String, Object> data = new HashMap<>();
data.put("id", mallMember.getId());
- data.put("level", mallMember.getLevel());
+ data.put("director", mallMember.getDirector());
model.addAttribute("vipLevelSet", data);
return FebsUtil.view("modules/mallMember/vip-level-setting");
}
+ @GetMapping("saleLevelSetting/{id}")
+ @RequiresPermissions("updateSaleLevel:update")
+ public String updateSaleLevel(@PathVariable(value = "id") String id, Model model) {
+ MallMember mallMember = mallMemberMapper.selectById(id);
+
+ Map<String, Object> data = new HashMap<>();
+ data.put("id", mallMember.getId());
+ data.put("storeMaster", mallMember.getStoreMaster());
+ model.addAttribute("saleLevelSet", data);
+ return FebsUtil.view("modules/mallMember/sale-level-setting");
+ }
+
@GetMapping("addCoupon/{id}")
public String addCoupon(@PathVariable long id, Model model) {
// AdminAgentLevelSetInfoVo data = mallMemberService.getAgentLevelSetInfoByMemberId(id);
--
Gitblit v1.9.1