From 1cb12391db6154f2d1a8fdf8e0506fe3f3eb2f15 Mon Sep 17 00:00:00 2001
From: luo <2855143437@qq.com>
Date: 星期日, 08 十月 2023 16:19:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CourseClient.java | 33 +++++++--------------------------
1 files changed, 7 insertions(+), 26 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 1129250..4df17a7 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,22 +1,19 @@
package com.dsh.course.feignClient.course;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.dsh.course.feignClient.course.model.*;
+import com.dsh.course.feignClient.account.model.QueryDataFee;
import com.dsh.course.feignClient.course.model.CourseChangeStateDTO;
import com.dsh.course.feignClient.course.model.QueryCourseList;
-import com.dsh.course.feignClient.course.model.*;
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.guns.modular.system.model.TQueryBenefitsVideosVO;
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.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -101,31 +98,10 @@
List<TCourse> queryCourseByType(Integer type);
- @PostMapping("/course/queryDiscountList")
- List<DiscountList> queryDiscountList(QueryDiscountList queryDiscountList);
-
- @PostMapping("/course/updateState")
- Boolean updateState(DiscountUpdateState discountUpdateState);
-
- @PostMapping("/course/queryDiscountListAudit")
- List<DiscountList> queryDiscountListAudit(QueryDiscountList queryDiscountList);
-
- @PostMapping("/course/auditDiscount")
- Boolean auditDiscount(AuditDiscount auditDiscount);
-
- @PostMapping("/course/queryByDiscountId")
- TCoursePackage queryByDiscountId(Integer id);
- @PostMapping("/course/queryDiscountById")
- Integer queryDiscountById(Integer id);
-
@PostMapping("/course/getPageageType")
List<Map<String, Object>> getPageageType();
- @PostMapping("/course/queryByTypeId")
- List<TCoursePackage> queryByTypeId(Integer oneId);
- @PostMapping("/course/queryByConfigId")
- List<Map<String, Object>> queryByConfigId(Integer oneId);
@PostMapping("/course/queryPackageById")
List<String> queryPackageById(Integer coursePackageId);
@@ -133,4 +109,9 @@
@PostMapping("/course/getHours")
String getHours(Integer coursePackageId1);
+
+ @PostMapping("/course/queryFee")
+ HashMap<String, Object> queryFee(QueryDataFee queryDataFee);
+
+
}
--
Gitblit v1.7.1