From 32106f511657695e79d53e98a350ce70a36f6da1 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 08 十二月 2023 22:07:08 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageSchedulingServiceImpl.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageSchedulingServiceImpl.java b/cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageSchedulingServiceImpl.java
index f94add7..61331ad 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageSchedulingServiceImpl.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageSchedulingServiceImpl.java
@@ -163,6 +163,15 @@
.gt("useTime", "now()")
.gt("laveClassHours", 0)
);
+
+ List<CoursePackageOrder> list1 = coursePackageOrderService.list(new QueryWrapper<CoursePackageOrder>()
+ .eq("payStatus", 2)
+ .eq("status", 1)
+ .eq("state", 1)
+ .gt("laveClassHours", 0)
+ .orderByAsc("insertTime")
+ );
+
for (CoursePackageOrderStudent coursePackageOrderStudent : list) {
CoursePackageScheduling coursePackageScheduling = this.getOne(new QueryWrapper<CoursePackageScheduling>()
.eq("appUserId", coursePackageOrderStudent.getAppUserId())
@@ -207,9 +216,12 @@
.eq("status", 1)
.eq("type", 1)
);
- laveClassHours -= count;
-
Integer codeTime = coursePackage.getCodeTime();
+ laveClassHours -= count;
+ //剩余数量不足以排课
+ if (laveClassHours.compareTo(codeTime) < 0) {
+ break;
+ }
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
//生成一周的排课数据
for (int i = 0; i < num; i++) {
--
Gitblit v1.7.1