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/CoursePackagePaymentClient.java | 45 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 43 insertions(+), 2 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 224d9c8..fb25304 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,9 +4,12 @@
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.*;
import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.*;
+import java.util.HashMap;
+import java.util.List;
import java.util.Map;
/**
@@ -16,7 +19,36 @@
@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
+ * @return
+ */
+ @PostMapping("/coursePackagePayment/queryResidueClassHourById")
+ public Integer queryResidueClassHourById(@RequestBody Long id);
+ /**
+ * 手动支付
+ * @return
+ */
+ @RequestMapping("/base/coursePackagePayment/changeState")
+ Object changeState(@RequestBody CoursePackagePayDTO dto);
+ /**
+ * 获取购课记录
+ */
+ @RequestMapping("/coursePackagePayment/listAll")
+ List<CoursePackagePaymentVO> listAll(@RequestBody CoursePackagePaymentQuery query);
/**
* 获取课程报名信息列表
* @param queryRegistrationRecord
@@ -41,7 +73,7 @@
* @return
*/
@PostMapping("/coursePackagePayment/queryCoursePackagePaymentById")
- TCoursePackagePayment queryCoursePackagePaymentById(Long id);
+ TCoursePackagePayment queryCoursePackagePaymentById(@RequestParam("id")Long id);
/**
@@ -51,7 +83,16 @@
@PostMapping("/coursePackagePayment/editCoursePackagePayment")
void editCoursePackagePayment(TCoursePackagePayment coursePackagePayment);
+ @PostMapping("/coursePackagePayment/editCoursePackagePayment1")
+ void editCoursePackagePayment1(@RequestBody TCoursePackagePayment coursePackagePayment);
+
@PostMapping("/coursePackagePayment/CountqueryByClassId")
Integer queryByClassId(Integer id);
+
+ @PostMapping("/coursePackagePayment/queryCourseData")
+ List<Map<String,Object>> queryCourseData(List<Integer> ids);
+
+ @PostMapping("/coursePackagePayment/coursePt")
+ HashMap<String, Object> coursePt(List<Integer> userPt);
}
--
Gitblit v1.7.1