From 0300f6a0d282236a8339c92268f4031f071101e5 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 31 十月 2025 19:19:44 +0800
Subject: [PATCH] App预约场地操作
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminController.java | 142 +++++++++++++++++++++++++---------------------
1 files changed, 77 insertions(+), 65 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminController.java
index e2552b5..6188bfa 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminController.java
@@ -398,28 +398,31 @@
jsonArray.add(jsonObject2);
}
}
- }else{
- // 返回过期的二维码 保证开门失败即可
- JSONObject jsonObject3 = new JSONObject();
- Date date1 = new Date();
- date1.setTime(date1.getTime() - 300 * 1000);
- jsonObject3.put("end_time", simpleDateFormat1.format( date1));
- jsonObject3.put("start_time", simpleDateFormat1.format( date1));
-
- jsonArray.add(jsonObject3);
}
+ }
+ if (jsonArray.isEmpty()){
+ // 返回过期的二维码 保证开门失败即可
+ JSONObject jsonObject3 = new JSONObject();
+ Date date1 = new Date();
+ date1.setTime(date1.getTime() - 300 * 1000);
+ jsonObject3.put("end_time", simpleDateFormat1.format( date1));
+ jsonObject3.put("start_time", simpleDateFormat1.format( date1));
+
+ jsonArray.add(jsonObject3);
}
}
}
else{
- // 返回过期的二维码 保证开门失败即可
- JSONObject jsonObject3 = new JSONObject();
- Date date1 = new Date();
- date1.setTime(date1.getTime() - 300 * 1000);
- jsonObject3.put("end_time", simpleDateFormat1.format( date1));
- jsonObject3.put("start_time", simpleDateFormat1.format( date1));
+ if (jsonArray.isEmpty()){
+ // 返回过期的二维码 保证开门失败即可
+ JSONObject jsonObject3 = new JSONObject();
+ Date date1 = new Date();
+ date1.setTime(date1.getTime() - 300 * 1000);
+ jsonObject3.put("end_time", simpleDateFormat1.format( date1));
+ jsonObject3.put("start_time", simpleDateFormat1.format( date1));
- jsonArray.add(jsonObject3);
+ jsonArray.add(jsonObject3);
+ }
}
if (!jsonArray.isEmpty()) {
huiminCardVO1.setEndTime(simpleDateFormat.format(payHuimin.getEndTime()));
@@ -559,7 +562,7 @@
Date start = DateUtil.parse(s1, "yyyy-MM-dd HH:mm:ss");
Date end = DateUtil.parse(e1, "yyyy-MM-dd HH:mm:ss");
if (new Date().after(start) && new Date().before(end)) {
-//
+//
Date date1 = new Date();
jsonObject2.put("start_time", simpleDateFormat1.format( date1));
date1.setTime(date1.getTime() + 30 * 1000);
@@ -568,27 +571,30 @@
jsonArray.add(jsonObject2);
}
}
- }else{
- // 返回过期的二维码 保证开门失败即可
- JSONObject jsonObject3 = new JSONObject();
- Date date1 = new Date();
- date1.setTime(date1.getTime() - 300 * 1000);
- jsonObject3.put("end_time", simpleDateFormat1.format( date1));
- jsonObject3.put("start_time", simpleDateFormat1.format( date1));
-
- jsonArray.add(jsonObject3);
}
+ }
+ if (jsonArray.isEmpty()){
+ // 返回过期的二维码 保证开门失败即可
+ JSONObject jsonObject3 = new JSONObject();
+ Date date1 = new Date();
+ date1.setTime(date1.getTime() - 300 * 1000);
+ jsonObject3.put("end_time", simpleDateFormat1.format( date1));
+ jsonObject3.put("start_time", simpleDateFormat1.format( date1));
+
+ jsonArray.add(jsonObject3);
}
}
}else{
- // 返回过期的二维码 保证开门失败即可
- JSONObject jsonObject = new JSONObject();
- Date date1 = new Date();
- date1.setTime(date1.getTime() - 300 * 1000);
- jsonObject.put("end_time", simpleDateFormat1.format( date1));
- jsonObject.put("start_time", simpleDateFormat1.format( date1));
+ if (jsonArray.isEmpty()){
+ // 返回过期的二维码 保证开门失败即可
+ JSONObject jsonObject3 = new JSONObject();
+ Date date1 = new Date();
+ date1.setTime(date1.getTime() - 300 * 1000);
+ jsonObject3.put("end_time", simpleDateFormat1.format( date1));
+ jsonObject3.put("start_time", simpleDateFormat1.format( date1));
- jsonArray.add(jsonObject);
+ jsonArray.add(jsonObject3);
+ }
}
if (!jsonArray.isEmpty()) {
// 将学员加入
@@ -698,27 +704,30 @@
jsonArray.add(jsonObject2);
}
}
- }else{
- // 返回过期的二维码 保证开门失败即可
- JSONObject jsonObject3 = new JSONObject();
- Date date1 = new Date();
- date1.setTime(date1.getTime() - 300 * 1000);
- jsonObject3.put("end_time", simpleDateFormat1.format( date1));
- jsonObject3.put("start_time", simpleDateFormat1.format( date1));
-
- jsonArray.add(jsonObject3);
}
+ }
+ if (jsonArray.isEmpty()){
+ // 返回过期的二维码 保证开门失败即可
+ JSONObject jsonObject3 = new JSONObject();
+ Date date1 = new Date();
+ date1.setTime(date1.getTime() - 300 * 1000);
+ jsonObject3.put("end_time", simpleDateFormat1.format( date1));
+ jsonObject3.put("start_time", simpleDateFormat1.format( date1));
+
+ jsonArray.add(jsonObject3);
}
}
}else{
- // 返回过期的二维码 保证开门失败即可
- JSONObject jsonObject = new JSONObject();
- Date date1 = new Date();
- date1.setTime(date1.getTime() - 300 * 1000);
- jsonObject.put("end_time", simpleDateFormat1.format( date1));
- jsonObject.put("start_time", simpleDateFormat1.format( date1));
+ if (jsonArray.isEmpty()){
+ // 返回过期的二维码 保证开门失败即可
+ JSONObject jsonObject3 = new JSONObject();
+ Date date1 = new Date();
+ date1.setTime(date1.getTime() - 300 * 1000);
+ jsonObject3.put("end_time", simpleDateFormat1.format( date1));
+ jsonObject3.put("start_time", simpleDateFormat1.format( date1));
- jsonArray.add(jsonObject);
+ jsonArray.add(jsonObject3);
+ }
}
TStudent tStudent = tStudents.stream().filter(e -> e.getId().equals(studentId)).findFirst().orElse(null);
if (tStudent!=null){
@@ -963,27 +972,30 @@
jsonArray.add(jsonObject2);
}
}
- }else{
- // 返回过期的二维码 保证开门失败即可
- JSONObject jsonObject3 = new JSONObject();
- Date date1 = new Date();
- date1.setTime(date1.getTime() - 300 * 1000);
- jsonObject3.put("end_time", simpleDateFormat1.format( date1));
- jsonObject3.put("start_time", simpleDateFormat1.format( date1));
-
- jsonArray.add(jsonObject3);
}
+ }
+ if (jsonArray.isEmpty()){
+ // 返回过期的二维码 保证开门失败即可
+ JSONObject jsonObject3 = new JSONObject();
+ Date date1 = new Date();
+ date1.setTime(date1.getTime() - 300 * 1000);
+ jsonObject3.put("end_time", simpleDateFormat1.format( date1));
+ jsonObject3.put("start_time", simpleDateFormat1.format( date1));
+
+ jsonArray.add(jsonObject3);
}
}
}else{
- // 返回过期的二维码 保证开门失败即可
- JSONObject jsonObject = new JSONObject();
- Date date1 = new Date();
- date1.setTime(date1.getTime() - 300 * 1000);
- jsonObject.put("end_time", simpleDateFormat1.format( date1));
- jsonObject.put("start_time", simpleDateFormat1.format( date1));
+ if (jsonArray.isEmpty()){
+ // 返回过期的二维码 保证开门失败即可
+ JSONObject jsonObject3 = new JSONObject();
+ Date date1 = new Date();
+ date1.setTime(date1.getTime() - 300 * 1000);
+ jsonObject3.put("end_time", simpleDateFormat1.format( date1));
+ jsonObject3.put("start_time", simpleDateFormat1.format( date1));
- jsonArray.add(jsonObject);
+ jsonArray.add(jsonObject3);
+ }
}
String temp = "{\"id\":"+tPayHuimin.getId() + ","+"\"sid\":" + sid.toJSONString() + "," + "\"rid\":" + rid + "," + "\"uid\":\"" + tPayHuimin.getStudentId().split(",")[0] + "\"," + "\"time\":" + jsonArray.toJSONString() + ",\"type\":" + 2 + ",\"codeType\":"+4+"\"dataId\":"+tPayHuimin.getId()+"}";
--
Gitblit v1.7.1