From 2b2e8603381d62b5da4a817710b33d583561ff3f Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 12 九月 2025 09:27:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-other/src/main/java/com/dsh/other/controller/TVipController.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/TVipController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/TVipController.java
index 912a123..43a29e9 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/TVipController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/TVipController.java
@@ -58,6 +58,9 @@
List<TicketVipResp> ticketVipRespList = new ArrayList<>();
String couponJson = vip.getCouponJson();
JSONArray couponJsonArray = JSONArray.parseArray(couponJson);
+ if(couponJsonArray==null){
+ continue;
+ }
for (Object o : couponJsonArray) {
JSONObject couponJsonObject = (JSONObject) o;
// 优惠券id
@@ -153,7 +156,7 @@
}
vip.setCouponList(couponVipRespList);
String ticketJson = vip.getTicketJson();
- if(ticketJson!=null){
+ if(ticketJson!=null && !"".equals(ticketJson)){
JSONArray ticketJsonArray = JSONArray.parseArray(ticketJson);
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
for (Object o : ticketJsonArray) {
--
Gitblit v1.7.1