From 8a89ba02db5c19db669a5cf9bb7d443223bdfb71 Mon Sep 17 00:00:00 2001
From: 刘帅 <rr.iii@qq.com>
Date: 星期二, 29 九月 2026 10:48:21 +0800
Subject: [PATCH] 会员管理及取消场地预约问题
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TVipController.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TVipController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TVipController.java
index ae8efc8..cd70dfc 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TVipController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TVipController.java
@@ -61,7 +61,13 @@
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Vip vip = vipService.getById(id);
+ if (vip == null) {
+ throw new IllegalArgumentException("会员卡不存在: " + id);
+ }
model.addAttribute("vip",vip);
+ // 编辑页的两个权益列表都会被模板遍历，即使会员卡尚未配置权益也必须提供空集合。
+ model.addAttribute("couponList", new ArrayList<Coupon>());
+ model.addAttribute("ticketList", new ArrayList<TicketDetailVO>());
if (vip.getCouponJson() != null && !vip.getCouponJson().isEmpty()){
String couponJson = vip.getCouponJson();
// 转化为jsonArray
@@ -128,10 +134,6 @@
model.addAttribute("couponList", new ArrayList<Coupon>());
}
}
- else{
- model.addAttribute("ticketList", new ArrayList<Coupon>());
-
- }
if (vip.getTicketJson() != null && !vip.getTicketJson().isEmpty()){
String ticketJson = vip.getTicketJson();
@@ -171,7 +173,12 @@
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Vip vip = vipService.getById(id);
+ if (vip == null) {
+ throw new IllegalArgumentException("会员卡不存在: " + id);
+ }
model.addAttribute("vip",vip);
+ model.addAttribute("couponList", new ArrayList<Coupon>());
+ model.addAttribute("ticketList", new ArrayList<TicketDetailVO>());
if (vip.getCouponJson() != null && !vip.getCouponJson().isEmpty()){
String couponJson = vip.getCouponJson();
// 转化为jsonArray
--
Gitblit v1.7.1