From 61296f3965dd87dcc02ada9c630a5bc2db5eda5b Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Fri, 20 Dec 2024 13:28:07 +0800
Subject: [PATCH] fix(mall): 修复查询充值记录时的空指针异常 - 在查询充值记录后，增加对结果为空的检查 - 如果查询结果为空，抛出 "记录不存在" 的异常 - 这个修改确保了在处理充值记录时，不会因为空指针而导致程序崩溃
---
src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 insertions(+), 1 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java
index 7945eee..a37da31 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java
@@ -9,6 +9,7 @@
import cc.mrbird.febs.mall.mapper.MallSalesmanMapper;
import cc.mrbird.febs.mall.service.IAdminMallMemberService;
import cc.mrbird.febs.mall.vo.*;
+import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import lombok.RequiredArgsConstructor;
import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -17,6 +18,9 @@
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
+
+import java.util.HashMap;
+import java.util.Map;
@Controller("mallMemberView")
@RequestMapping(FebsConstant.VIEW_PREFIX + "modules/mallMember")
@@ -76,7 +80,7 @@
@GetMapping("mallSystemPay/{type}/{id}")
@RequiresPermissions("mallSystemPay:update")
public String systemPay(@PathVariable long id, @PathVariable Integer type, Model model) {
- MallMemberVo data = mallMemberService.getMallMemberInfoById(id);
+ MallMemberVo data = mallMemberService.getMallMemberWalletById(id);
model.addAttribute("systemPay", data);
model.addAttribute("type", type);
return FebsUtil.view("modules/mallMember/mallSystemPay");
@@ -399,5 +403,30 @@
return FebsUtil.view("modules/mallMember/couponSelect");
}
+ @GetMapping("vipLevelSetting/{id}")
+ 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("vipLevelTime", DateUtil.formatDate(mallMember.getVipLevelTime()));
+ model.addAttribute("vipLevelSet", data);
+ return FebsUtil.view("modules/mallMember/vip-level-setting");
+ }
+
+ @GetMapping("addCoupon/{id}")
+ public String addCoupon(@PathVariable long id, Model model) {
+// AdminAgentLevelSetInfoVo data = mallMemberService.getAgentLevelSetInfoByMemberId(id);
+ model.addAttribute("memberId", id);
+ return FebsUtil.view("modules/mallMember/member-coupon-select");
+ }
+
+
+ @GetMapping("memberBenefitsList")
+ @RequiresPermissions("memberBenefitsList:view")
+ public String memberBenefitsList() {
+ return FebsUtil.view("modules/mallMember/memberBenefitsList");
+ }
}
--
Gitblit v1.9.1