From f7e51fc7c91e474e5c0bcc79c47f074c0a59b5c3 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 11 十月 2023 20:03:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CourseClient.java | 42 ++++++++++++++++++++++++++++++++++--------
1 files changed, 34 insertions(+), 8 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CourseClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CourseClient.java
index 171b993..f4a30f6 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CourseClient.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CourseClient.java
@@ -1,18 +1,18 @@
package com.dsh.course.feignClient.course;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.dsh.course.feignClient.course.model.CourseChangeStateDTO;
-import com.dsh.course.feignClient.course.model.QueryCourseList;
-import com.dsh.guns.modular.system.model.EditCourseState;
-import com.dsh.guns.modular.system.model.TCourse;
-import com.dsh.guns.modular.system.model.TQueryBenefitsVideosDTO;
-import com.dsh.guns.modular.system.model.TQueryBenefitsVideosVO;
+import com.dsh.course.feignClient.account.model.QueryDataFee;
+import com.dsh.course.feignClient.course.model.*;
+import com.dsh.course.model.AuditDiscount;
+import com.dsh.guns.modular.system.model.*;
+import com.dsh.guns.modular.system.model.dto.CoursePackage;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -46,12 +46,11 @@
@PostMapping("/course/queryCourseLists")
Page<Map<String, Object>> queryCourseLists(QueryCourseList queryCourseList);
-
/**
* 添加课程
* @param course
*/
- @PostMapping("/course/queryCourseList")
+ @PostMapping("/course/addCourse")
void addCourse(TCourse course);
@@ -107,4 +106,31 @@
@PostMapping("/course/getHours")
String getHours(Integer coursePackageId1);
+
+
+ @PostMapping("/course/queryFee")
+ HashMap<String, Object> queryFee(QueryDataFee queryDataFee);
+
+
+ @PostMapping("/course/queryByDiscountId")
+ TCoursePackage queryByDiscountId(Integer id);
+ @PostMapping("/course/queryByDiscountId1")
+ CoursePackage queryByDiscountId1(Integer id);
+
+
+ @PostMapping("/course/queryDiscountById")
+ Integer queryDiscountById(Integer id);
+
+
+ @PostMapping("/course/queryDiscountList")
+ List<DiscountList> queryDiscountList(QueryDiscountList queryDiscountList);
+
+ @PostMapping("/course/queryDiscountListAudit")
+ List<DiscountList> queryDiscountListAudit(QueryDiscountList queryDiscountList);
+
+ @PostMapping("/course/updateState")
+ Boolean updateState(DiscountUpdateState discountUpdateState);
+
+ @PostMapping("/course/auditDiscount")
+ Boolean auditDiscount(AuditDiscount auditDiscount);
}
--
Gitblit v1.7.1