From aff908fac4b654fd5bffa7b8031b3ff1eb4bf01f Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 05 十一月 2025 17:04:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-management/src/main/webapp/WEB-INF/view/system/ticket/ticket_add.html | 2 +-
cloud-server-other/src/main/java/com/dsh/other/controller/CodeCallBackController.java | 17 ++++++++++++++++-
cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/yuyue_info.html | 4 ++--
3 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/yuyue_info.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/yuyue_info.html
index a949b1f..cf07855 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/yuyue_info.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/yuyue_info.html
@@ -37,8 +37,8 @@
<div class="form-group">
<label class="col-sm-3 control-label">*预约场地类型：</label>
<div class="col-sm-4">
- <input type="radio" name="type" value="1" ${item.isHalf ==1 ? '' :'checked'} onclick="updateType(1)" disabled> 全场
- <input type="radio" name="type" value="2" ${item.isHalf ==2 ? '' :'checked'} onclick="updateType(2)" disabled> 半场
+ <input type="radio" name="type9" ${item.isHalf ==2 ? "checked" :""} disabled> 全场
+ <input type="radio" name="type9" ${item.isHalf ==1 ? "checked" :""} disabled> 半场
</div>
</div>
<div class="form-group">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ticket/ticket_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ticket/ticket_add.html
index 6459c66..1596c4a 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ticket/ticket_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ticket/ticket_add.html
@@ -79,7 +79,7 @@
</div>
</div>
- <#avatar id="cover" name="*门票封面(推荐像素350x350px)" />
+ <#avatar id="cover" name="*门票封面(推荐像素350x350px)" avatarImg="" />
<div class="row" id="app" >
<div class="col-sm-6" style="width: 100%;margin-left: 7%">
diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/CodeCallBackController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/CodeCallBackController.java
index a4c3862..4487ef8 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/CodeCallBackController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/CodeCallBackController.java
@@ -61,11 +61,26 @@
return ResultUtil.success();
}
if (codeType==3){
- // 远程调用将门票设置为已使用 然后判断是否能入场
+ // 判断是否能入场 远程调用将门票设置为已使用
LocalDate now = LocalDate.now();
+ Date date1 = new Date();
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+ SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("yyyy-MM-dd HH:mm");
String day = simpleDateFormat.format(now);
+ String nowDate = simpleDateFormat.format(date1);
+
List<QuerySiteTimes> querySiteTimes = siteService.querySiteTimes(rid, day, null, null, 2);
+ Integer flag =0;
+ for (QuerySiteTimes querySiteTime : querySiteTimes) {
+ if (querySiteTime.getSelectable()==1){
+ //
+ }
+ }
+ if (flag==0){
+ return ResultUtil.error("该时间段已无空位");
+ }else{
+ return ResultUtil.success();
+ }
}
if (codeType==4){
// 判断能否入场
--
Gitblit v1.7.1