From b87922420561a35c1e99b67fb6caf3fe30bc8ccf Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期四, 16 十一月 2023 08:57:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageDiscountController.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageDiscountController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageDiscountController.java
index 189b306..452cd17 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageDiscountController.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageDiscountController.java
@@ -29,6 +29,14 @@
.eq("auditStatus", 2));
}
/**
+ * 获取根据课包id获取课包折扣
+ */
+ @ResponseBody
+ @PostMapping("/coursePackageDiscount/queryByCoursePackageId1")
+ public List<TCoursePackageDiscount> queryByCoursePackageId1(@RequestBody Integer coursePackageId){
+ return coursePackageDiscountService.list(new QueryWrapper<TCoursePackageDiscount>().eq("coursePackageId", coursePackageId));
+ }
+ /**
* 获取课包折扣
* @param coursePackagePaymentConfigId
* @return
@@ -37,7 +45,7 @@
@PostMapping("/coursePackageDiscount/queryCoursePackageDiscount")
public List<TCoursePackageDiscount> queryCoursePackageDiscount(@RequestBody Integer coursePackagePaymentConfigId){
return coursePackageDiscountService.list(new QueryWrapper<TCoursePackageDiscount>().eq("coursePackagePaymentConfigId", coursePackagePaymentConfigId)
- .eq("auditStatus", 2));
+ );
}
@@ -48,6 +56,9 @@
@ResponseBody
@PostMapping("/coursePackageDiscount/setCoursePackageDiscount")
public void setCoursePackageDiscount(@RequestBody List<TCoursePackageDiscount> list){
+ for (TCoursePackageDiscount tCoursePackageDiscount : list) {
+ tCoursePackageDiscount.setStatus(1);
+ }
TCoursePackageDiscount tCoursePackageDiscount = list.get(0);
coursePackageDiscountService.remove(new QueryWrapper<TCoursePackageDiscount>().eq("coursePackageId", tCoursePackageDiscount.getCoursePackageId()));
if(list.size() > 0){
@@ -56,6 +67,12 @@
}
+ @PostMapping("/coursePackageDiscount/queryCoursePackageDiscountOne")
+ public List<TCoursePackageDiscount> queryCoursePackageDiscountOne(@RequestBody Integer id){
+ return coursePackageDiscountService.list(new QueryWrapper<TCoursePackageDiscount>().eq("coursePackagePaymentConfigId", id)
+ .ne("auditStatus", 2));
+ }
+
--
Gitblit v1.7.1