java/PlayPai.git

			@@ -398,7 +398,9 @@
			jsonArray.add(jsonObject2);
			}
			}
			}else{
			}
			}
			if (jsonArray.isEmpty()){
			// 返回过期的二维码保证开门失败即可
			JSONObject jsonObject3 = new JSONObject();
			Date date1 = new Date();
			@@ -407,11 +409,11 @@
			jsonObject3.put("start_time", simpleDateFormat1.format( date1));

			jsonArray.add(jsonObject3);
			}
			}
			}
			}
			else{
			if (jsonArray.isEmpty()){
			// 返回过期的二维码保证开门失败即可
			JSONObject jsonObject3 = new JSONObject();
			Date date1 = new Date();
			@@ -420,19 +422,20 @@
			jsonObject3.put("start_time", simpleDateFormat1.format( date1));

			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);
			@@ -568,7 +571,9 @@
			jsonArray.add(jsonObject2);
			}
			}
			}else{
			}
			}
			if (jsonArray.isEmpty()){
			// 返回过期的二维码保证开门失败即可
			JSONObject jsonObject3 = new JSONObject();
			Date date1 = new Date();
			@@ -579,16 +584,17 @@
			jsonArray.add(jsonObject3);
			}
			}
			}
			}else{
			if (jsonArray.isEmpty()){
			// 返回过期的二维码保证开门失败即可
			JSONObject jsonObject = new JSONObject();
			JSONObject jsonObject3 = 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));
			jsonObject3.put("end_time", simpleDateFormat1.format( date1));
			jsonObject3.put("start_time", simpleDateFormat1.format( date1));

			jsonArray.add(jsonObject);
			jsonArray.add(jsonObject3);
			}
			}
			if (!jsonArray.isEmpty()) {
			// 将学员加入
			@@ -698,7 +704,9 @@
			jsonArray.add(jsonObject2);
			}
			}
			}else{
			}
			}
			if (jsonArray.isEmpty()){
			// 返回过期的二维码保证开门失败即可
			JSONObject jsonObject3 = new JSONObject();
			Date date1 = new Date();
			@@ -709,25 +717,26 @@
			jsonArray.add(jsonObject3);
			}
			}
			}
			}else{
			if (jsonArray.isEmpty()){
			// 返回过期的二维码保证开门失败即可
			JSONObject jsonObject = new JSONObject();
			JSONObject jsonObject3 = 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));
			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,7 +972,9 @@
			jsonArray.add(jsonObject2);
			}
			}
			}else{
			}
			}
			if (jsonArray.isEmpty()){
			// 返回过期的二维码保证开门失败即可
			JSONObject jsonObject3 = new JSONObject();
			Date date1 = new Date();
			@@ -974,19 +985,20 @@
			jsonArray.add(jsonObject3);
			}
			}
			}
			}else{
			if (jsonArray.isEmpty()){
			// 返回过期的二维码保证开门失败即可
			JSONObject jsonObject = new JSONObject();
			JSONObject jsonObject3 = 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));
			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);