From ccbd86bc5f747b748b5bde257a789d748b8cefbb Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 11 Sep 2025 17:41:35 +0800
Subject: [PATCH] ``` refactor(service): 在设置活动类别名称前增加非空检查在AdminHappyActivityServiceImpl.java中，对happyActivity的categoryId进行了非空检查，并且确认categoryMap中包含该categoryId后，再设置其categoryName。这样可以避免因为空值或不存在的键导致的潜在异常。 ```
---
src/main/java/cc/mrbird/febs/mall/controller/member/ViewMallMemberController.java | 27 +++++++++++++++++++++++++--
1 files changed, 25 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..614e08d 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
@@ -40,6 +40,16 @@
* 平台账单
* @return
*/
+ @GetMapping("dataInfo")
+ @RequiresPermissions("dataInfo:view")
+ public String dataInfo() {
+ return FebsUtil.view("modules/mallMember/dataInfo");
+ }
+
+ /**
+ * 平台账单
+ * @return
+ */
@GetMapping("mallDataList")
@RequiresPermissions("mallDataList:view")
public String mallDataList() {
@@ -77,7 +87,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 +413,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