From cabda12d788eeb6e056113ac8352dfaf972490d9 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 20 十月 2025 17:10:44 +0800
Subject: [PATCH] bug修改,后台新增预约记录，玩湃惠民卡修改二维码参数规则，启动游戏取消校验是否订场校验
---
cloud-server-other/src/main/java/com/dsh/other/controller/TVipController.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 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..35c530b 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,13 +58,19 @@
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
Integer id = Integer.valueOf(couponJsonObject.getString("id"));
// 优惠券数量
Integer value = Integer.valueOf(couponJsonObject.getString("value"));
- Coupon coupon = coupons.stream().filter(e -> e.getId().equals(id)).findFirst().orElse(new Coupon());
+ Coupon coupon = coupons.stream().filter(e -> e.getId().equals(id)).findFirst().orElse(null);
+ if (coupon==null){
+ continue;
+ }
CouponVipResp couponVipResp = new CouponVipResp();
couponVipResp.setId(coupon.getId());
couponVipResp.setName(coupon.getName());
@@ -153,7 +159,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