From 41c07e4558ed3a1cbdda0711f78cd3a812c06829 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期四, 28 九月 2023 18:34:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CoursePackagePaymentClient.java | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CoursePackagePaymentClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CoursePackagePaymentClient.java
index f251e0d..8d09904 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CoursePackagePaymentClient.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CoursePackagePaymentClient.java
@@ -4,14 +4,9 @@
import com.dsh.course.feignClient.course.model.QueryRegistrationRecord;
import com.dsh.course.feignClient.course.model.QueryWalkInStudentList;
import com.dsh.course.feignClient.course.model.TCoursePackagePayment;
-import com.dsh.guns.modular.system.model.CoursePackagePayDTO;
-import com.dsh.guns.modular.system.model.CoursePackagePaymentQuery;
-import com.dsh.guns.modular.system.model.CoursePackagePaymentVO;
+import com.dsh.guns.modular.system.model.*;
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 org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Map;
@@ -23,6 +18,17 @@
@FeignClient("mb-cloud-course")
public interface CoursePackagePaymentClient {
+ /**
+ * 获取报名订单记录列表
+ */
+ @RequestMapping("/registerOrder/listAllRegister")
+ List<RegisterOrderVO> listAllRegister(@RequestBody RegisterOrderQuery query);
+ /**
+ * 添加购课记录-后台
+ * @return
+ */
+ @RequestMapping("/base/coursePackagePayment/add")
+ Object addCoursePackagePayment(@RequestBody com.dsh.guns.modular.system.model.TCoursePackagePayment coursePackagePayment);
/**
* 获取学员剩余课时
* @param id
@@ -66,7 +72,7 @@
* @return
*/
@PostMapping("/coursePackagePayment/queryCoursePackagePaymentById")
- TCoursePackagePayment queryCoursePackagePaymentById(Long id);
+ TCoursePackagePayment queryCoursePackagePaymentById(@RequestParam("id")Long id);
/**
@@ -75,4 +81,11 @@
*/
@PostMapping("/coursePackagePayment/editCoursePackagePayment")
void editCoursePackagePayment(TCoursePackagePayment coursePackagePayment);
+
+ @PostMapping("/coursePackagePayment/editCoursePackagePayment1")
+ void editCoursePackagePayment1(@RequestBody TCoursePackagePayment coursePackagePayment);
+
+
+ @PostMapping("/coursePackagePayment/CountqueryByClassId")
+ Integer queryByClassId(Integer id);
}
--
Gitblit v1.7.1