From 317392255ab65aa80ef841898cf8767e4700119d Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 31 十月 2025 19:19:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
index cf8adae..40475ec 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
@@ -1492,19 +1492,26 @@
siteBooking.setAddType(1);
//存开始和结束时间
+ // times格式示例: 2025-10-14 19:00-19:30;2025-10-14 19:30-20:00;2025-10-14 20:00-20:30;2025-10-14 20:30-21:00
+ // targetAudience字段会由Spring MVC自动绑定（1=订场，2=散客）
String times = siteBooking.getTimes();
String[] dates = times.split(";");
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
try {
+ // 提取最早的开始时间
+ // dates[0] 格式: 2025-10-14 19:00-19:30
String start = dates[0];
String startDateStr = start.substring(0, start.lastIndexOf("-"));
Date startDate = format.parse(startDateStr);
+ // 提取最晚的结束时间
+ // dates[dates.length - 1] 格式: 2025-10-14 20:30-21:00
String end = dates[dates.length - 1];
String[] str = end.split(" ");
String endDateStr = str[0] + " " + str[1].substring(str[1].indexOf("-") + 1);
Date endDate = format.parse(endDateStr);
+
siteBooking.setStartTime(startDate);
siteBooking.setEndTime(endDate);
} catch (Exception e) {
--
Gitblit v1.7.1