From 4e8cadb13ebd6f01b8cf6d5cc89757cf8e960792 Mon Sep 17 00:00:00 2001
From: 刘帅 <rr.iii@qq.com>
Date: 星期三, 30 九月 2026 12:22:24 +0800
Subject: [PATCH] 门店管理修改
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TVipController.java | 15 ++++-----------
1 files changed, 4 insertions(+), 11 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 cd70dfc..ae8efc8 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,13 +61,7 @@
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
@@ -134,6 +128,10 @@
model.addAttribute("couponList", new ArrayList<Coupon>());
}
}
+ else{
+ model.addAttribute("ticketList", new ArrayList<Coupon>());
+
+ }
if (vip.getTicketJson() != null && !vip.getTicketJson().isEmpty()){
String ticketJson = vip.getTicketJson();
@@ -173,12 +171,7 @@
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