From 437a74c950f626398edd13025c654286280e7bbc Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 01 九月 2025 18:01:30 +0800
Subject: [PATCH] bug修改
---
cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageController.java | 25 +++++++++++++++++++------
1 files changed, 19 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 6592567..b03944b 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
@@ -50,10 +50,15 @@
@Resource
private ICoursePackagePaymentConfigService icppconfigService;
+ @Autowired
+ private ICoursePackageOrderService coursePackageOrderService;
@Autowired
private TokenUtil tokenUtil;
+
+ @Autowired
+ private ICoursePackageSchedulingService coursePackageSchedulingService;
/**
@@ -69,8 +74,15 @@
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());
+ List<Integer> collect = coursePackageOrderService.list(new QueryWrapper<CoursePackageOrder>()
+ .in("coursePackageId", courseIds)
+ .eq("payStatus", 2)
+ ).stream().map(CoursePackageOrder::getAppUserId).collect(Collectors.toList());
+ userIds.addAll(collect);
return userIds;
}
@@ -239,8 +251,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 +262,8 @@
classTime.add(s);
}
}
-
// coursePackageInfo.setTimes(classTime);
String classTimeAsString = String.join("|", classTime);
-
-
courseVo.setClassStartTime(classTimeAsString);
courseVo.setCoverDrawing(coursePackage.getCoverDrawing());
courseVo.setApplicantsNumber(count);
@@ -320,6 +327,7 @@
@ResponseBody
@PostMapping("/coursePackage/addCoursePackage")
public Integer addCoursePackage(@RequestBody TCoursePackage coursePackage) {
+ coursePackage.setInsertTime(new Date());
coursePackage.setNeedNum(coursePackage.getCodeTime());
return coursePackageService.addCoursePackage(coursePackage);
}
@@ -333,7 +341,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