From b3bf5a0b4fac7ba6bc85b2bdce5e05d55cdeb69f Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期二, 28 十一月 2023 21:46:50 +0800
Subject: [PATCH] 11.27,9
---
cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageOrderStudentServiceImpl.java | 33 ++++++++++++++++++++-------------
1 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageOrderStudentServiceImpl.java b/cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageOrderStudentServiceImpl.java
index c4a56a5..3b2c382 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageOrderStudentServiceImpl.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageOrderStudentServiceImpl.java
@@ -25,6 +25,7 @@
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
+import java.util.stream.Collectors;
/**
* @author zhibing.pu
@@ -60,21 +61,28 @@
.eq("status", 1)
.orderByDesc("insertTime"));
- List<Integer> ids = new ArrayList<>();
- for (CoursePackageOrderStudent tCoursePackagePayment : tCoursePackagePayments) {
- ids.add(tCoursePackagePayment.getCoursePackageId());
- }
+
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(new Date());
+ calendar.set(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH), calendar.get(Calendar.DAY_OF_MONTH), 23, 59, 59);
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ List<CoursePackageScheduling> list = coursePackageSchedulingService.list(new QueryWrapper<CoursePackageScheduling>()
+ .eq("appUserId", appUserId)
+ .eq("studentId", stuId)
+// .lt("classDate", sdf.format(calendar.getTime()))
+ .orderByAsc("classDate")
+ );
+ List<Long> ids = list.stream().map(CoursePackageScheduling::getId).collect(Collectors.toList());
+
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy.MM.dd");
SimpleDateFormat format = new SimpleDateFormat("yyyy.MM.dd HH:mm");
- if (tCoursePackagePayments.size() > 0) {
+ if (list.size() > 0) {
// int pageNum = 1; // 页码
int pageSize = 10; // 每页记录数
Page<CoursePackageStudent> page = new Page<>(pageNum, pageSize);
IPage<CoursePackageStudent> coursePackageStudentPage = cpsMapper.selectPage(page, new QueryWrapper<CoursePackageStudent>()
- .in("coursePackageId", ids)
- .eq("studentId", stuId)
- .eq("appUserId", appUserId)
+ .in("coursePackageSchedulingId", ids)
.eq("reservationStatus", 1));
List<CoursePackageStudent> coursePackageStudent1 = coursePackageStudentPage.getRecords();
@@ -111,7 +119,6 @@
if (byId == null) {
continue;
}
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String dateString1 = sdf.format(byId.getClassDate());
String dateString2 = sdf.format(byId.getEndDate());
@@ -125,7 +132,7 @@
String[] split = classWeeks.split(";");
List<String> integerList = Arrays.asList(split);
String weekOfDate = DateTimeHelper.getWeekOfDate(new Date());
- if (integerList.contains(weekOfDate)) {
+// if (integerList.contains(weekOfDate)) {
String dat = simpleDateFormat.format(byId.getClassDate()) + " " + dateString1.substring(11);
Date start = null;
@@ -164,9 +171,9 @@
}
}
}
- } else {
- recordVo.setStatus(1);
- }
+// } else {
+// recordVo.setStatus(1);
+// }
recordVoList.add(recordVo);
}
--
Gitblit v1.7.1