From f3228ef06ffc53fdbe3c51b58ed24e5f5686457f Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 03 十一月 2025 20:27:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminController.java | 152 +++++++++++++++++++++++++++-----------------------
1 files changed, 82 insertions(+), 70 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 22829e9..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,41 +398,44 @@
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()));
TStudent tStudent = tStudents.stream().filter(e -> e.getId().equals(Integer.valueOf(payHuimin.getStudentId().split(",")[0]))).findFirst().orElse(null);
if (tStudent!=null){
huiminCardVO1.setStudentName(tStudent.getName());
- String temp = "{\"id\":"+payHuimin.getId() + ","+"\"sid\":" + sid.toJSONString() + "," + "\"rid\":" + rid + "," + "\"uid\":\"" + tStudent.getId() + "\"," + "\"time\":" + jsonArray.toJSONString() + ",\"type\":" + 2 + "}";
+ String temp = "{\"id\":"+payHuimin.getId() + ","+"\"sid\":" + sid.toJSONString() + "," + "\"rid\":" + rid + "," + "\"uid\":\"" + tStudent.getId() + "\"," + "\"time\":" + jsonArray.toJSONString() + ",\"type\":" + 2 + ",\"codeType\":"+4+"\"dataId\":"+payHuimin.getId()+"}";
huiminCardVO1.setQrCode(temp);
}else{
huiminCardVO1.setStudentName("");
- String temp = "{\"id\":"+payHuimin.getId() + ","+"\"sid\":" + sid.toJSONString() + "," + "\"rid\":" + rid + "," + "\"uid\":\"" + 0 + "\"," + "\"time\":" + jsonArray.toJSONString() + ",\"type\":" + 2 + "}";
+ String temp = "{\"id\":"+payHuimin.getId() + ","+"\"sid\":" + sid.toJSONString() + "," + "\"rid\":" + rid + "," + "\"uid\":\"" + 0 + "\"," + "\"time\":" + jsonArray.toJSONString() + ",\"type\":" + 2 + ",\"codeType\":"+4+"\"dataId\":"+payHuimin.getId()+"}";
huiminCardVO1.setQrCode(temp);
}
huiminCardVOS.add(huiminCardVO1);
@@ -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,36 +704,39 @@
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){
huiminCardStudentVO.setStudentName(tStudent.getName());
- String temp = "{\"id\":"+tPayHuimin.getId() + ","+"\"sid\":" + sid.toJSONString() + "," + "\"rid\":" + rid + "," + "\"uid\":\"" + tStudent.getId() + "\"," + "\"time\":" + jsonArray.toJSONString() + ",\"type\":" + 2 + "}";
+ String temp = "{\"id\":"+tPayHuimin.getId() + ","+"\"sid\":" + sid.toJSONString() + "," + "\"rid\":" + rid + "," + "\"uid\":\"" + tStudent.getId() + "\"," + "\"time\":" + jsonArray.toJSONString() + ",\"type\":" + 2 + ",\"codeType\":"+4+"\"dataId\":"+tPayHuimin.getId()+"}";
huiminCardStudentVO.setQrCode(temp);
}else{
huiminCardStudentVO.setStudentName("");
- String temp = "{\"id\":"+tPayHuimin.getId() + ","+"\"sid\":" + sid.toJSONString() + "," + "\"rid\":" + rid + "," + "\"uid\":\"" + 0 + "\"," + "\"time\":" + jsonArray.toJSONString() + ",\"type\":" + 2 + "}";
+ String temp = "{\"id\":"+tPayHuimin.getId() + ","+"\"sid\":" + sid.toJSONString() + "," + "\"rid\":" + rid + "," + "\"uid\":\"" + 0 + "\"," + "\"time\":" + jsonArray.toJSONString() + ",\"type\":" + 2 + ",\"codeType\":"+4+"\"dataId\":"+tPayHuimin.getId()+"}";
huiminCardStudentVO.setQrCode(temp);
}
@@ -963,30 +972,33 @@
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 + "}";
+ 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()+"}";
myHuiminCardDetailVO.setQrCode(temp);
myHuiminCardDetailVO.setCardId(tPayHuimin.getCardId());
myHuiminCardDetailVO.setHuiminCard(byId);
--
Gitblit v1.7.1