From c52f83ef5f702b3c178881d3eee72267c77e7751 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期三, 24 七月 2024 17:26:46 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0
---
cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageController.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageController.java
index 9c0a149..f6a0238 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageController.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageController.java
@@ -55,6 +55,9 @@
@Autowired
private TokenUtil tokenUtil;
+ @Autowired
+ private ICoursePackageSchedulingService coursePackageSchedulingService;
+
/**
* 根据门店ids获取课包ids 根据课包ids 获取购课记录的用户ids
@@ -69,7 +72,8 @@
if (courseIds.size() == 0) {
return new ArrayList<>();
} else {
- List<Integer> userIds = tcppmenService.list(new QueryWrapper<TCoursePackagePayment>().in("coursePackageId", courseIds))
+ List<Integer> userIds = tcppmenService.list(new QueryWrapper<TCoursePackagePayment>().in("coursePackageId", courseIds)
+ .eq("payStatus",2))
.stream().map(TCoursePackagePayment::getAppUserId).collect(Collectors.toList());
return userIds;
}
@@ -239,8 +243,6 @@
StoreOfCourseVo courseVo = new StoreOfCourseVo();
courseVo.setCourseId(coursePackage.getId());
courseVo.setName(coursePackage.getName() + "(" + store.getName() + ")");
-
-
String classStartTime = coursePackage.getClassStartTime();
String classEndTime = coursePackage.getClassEndTime();
ArrayList<String> classTime = new ArrayList<>();
@@ -252,11 +254,8 @@
classTime.add(s);
}
}
-
// coursePackageInfo.setTimes(classTime);
String classTimeAsString = String.join("|", classTime);
-
-
courseVo.setClassStartTime(classTimeAsString);
courseVo.setCoverDrawing(coursePackage.getCoverDrawing());
courseVo.setApplicantsNumber(count);
@@ -334,7 +333,12 @@
@ResponseBody
@PostMapping("/coursePackage/updateCoursePackageById")
public void updateCoursePackageById(@RequestBody TCoursePackage coursePackage) {
+ TCoursePackage coursePackage1 = coursePackageService.getById(coursePackage.getId());
coursePackageService.updateCoursePackageById(coursePackage);
+ //暂停课程后的开课操作（需要检查是否继续排课）
+ if(coursePackage1.getStatus() == 4 && coursePackage.getStatus() == 1){
+ coursePackageSchedulingService.startAndScheduleClasses(coursePackage.getId());
+ }
}
--
Gitblit v1.7.1