From 062fb1ed6efcaac5d75bbe184524c4929dff7fcd Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期三, 18 十月 2023 15:25:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageDiscountController.java |   22 ++++++++++++++++------
 1 files changed, 16 insertions(+), 6 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 45be4c1..d7b3b06 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
@@ -19,7 +19,15 @@
     @Autowired
     private TCoursePackageDiscountService coursePackageDiscountService;
 
-
+    /**
+     * 获取根据课包id获取课包折扣
+     */
+    @ResponseBody
+    @PostMapping("/coursePackageDiscount/queryByCoursePackageId")
+    public List<TCoursePackageDiscount> queryByCoursePackageId(@RequestBody Integer coursePackageId){
+        return coursePackageDiscountService.list(new QueryWrapper<TCoursePackageDiscount>().eq("coursePackageId", coursePackageId)
+                .eq("auditStatus", 2));
+    }
     /**
      * 获取课包折扣
      * @param coursePackagePaymentConfigId
@@ -31,11 +39,7 @@
         return coursePackageDiscountService.list(new QueryWrapper<TCoursePackageDiscount>().eq("coursePackagePaymentConfigId", coursePackagePaymentConfigId)
                 .eq("auditStatus", 2));
     }
-    @PostMapping("/coursePackageDiscount/queryCoursePackageDiscountOne")
-    public List<TCoursePackageDiscount> queryCoursePackageDiscountOne(@RequestBody Integer id){
-        return coursePackageDiscountService.list(new QueryWrapper<TCoursePackageDiscount>().eq("coursePackagePaymentConfigId", id)
-                .ne("auditStatus", 2));
-    }
+
 
     /**
      * 编辑课包折扣
@@ -52,6 +56,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