From 331ae50b1cdcb31a4a0c182abb82aec5c1b12f83 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期三, 15 十一月 2023 09:40:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java
index 86c427a..71f86ba 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java
@@ -452,7 +452,7 @@
}
@PostMapping("/course/getHours")
- public String getHours(@RequestBody Integer coursePackageId1){
+ public List<Integer> getHours(@RequestBody Integer coursePackageId1){
return coursePackageService.getHours(coursePackageId1);
}
@@ -498,8 +498,9 @@
@PostMapping("/course/auditDiscount")
public Boolean auditDiscount( @RequestBody AuditDiscount auditDiscount){
- TCoursePackageDiscount byId = discountService.getById(auditDiscount.getId());
- List<TCoursePackageDiscount> list = discountService.list(new LambdaQueryWrapper<TCoursePackageDiscount>().eq(TCoursePackageDiscount::getCoursePackageId, byId.getCoursePackageId()));
+
+ List<TCoursePackageDiscount> list = discountService.list(new LambdaQueryWrapper<TCoursePackageDiscount>()
+ .eq(TCoursePackageDiscount::getCoursePackageId, auditDiscount.getId()));
for (TCoursePackageDiscount tCoursePackageDiscount : list) {
tCoursePackageDiscount.setAuditStatus(auditDiscount.getType());
tCoursePackageDiscount.setAuditRemark(auditDiscount.getText());
--
Gitblit v1.7.1