From 4e9147e418d750ca426fe0668e97353f2524fe9c Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 07 十二月 2023 09:31:39 +0800
Subject: [PATCH] 修改bug
---
cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java
index a6fc83c..6b73cd3 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java
@@ -1315,7 +1315,6 @@
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
SimpleDateFormat format1 = new SimpleDateFormat("yyyy-MM-dd HH:mm");
-
//剩余课时
Integer laveClassHours = coursePackageOrderStudent.getLaveClassHours();
//扣除课时数
@@ -1342,11 +1341,26 @@
continue;
}
-
//大于有效期不进行排课
if (calendar.getTimeInMillis() >= validity.getTime()) {
break;
}
+
+ //检查是否有体验购课
+ int count = coursePackageSchedulingService.count(new QueryWrapper<CoursePackageScheduling>()
+ .eq("type", 3)
+ .eq("appUserId", userId)
+ .eq("studentId", sId)
+ .eq("coursePackageId", tCoursePackage.getId())
+ .eq("status", 1)
+ .eq("DATE_FORMAT(classDate, '%Y-%m-%d')", format.format(time))
+ );
+ //有体验购课，不进行排课
+ if(count != 0){
+ calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) + 1);
+ continue;
+ }
+
for (int j = 0; j < split.length; j++) {
//剩余数量不足以排课
if (laveClassHours.compareTo(codeTime) < 0) {
--
Gitblit v1.7.1