From 7e7f901b2172281dc294dfbc67e6ad00625f09f4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 04 三月 2024 10:11:21 +0800
Subject: [PATCH] 合并代码
---
cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CourseStuddentClient.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CourseStuddentClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CourseStuddentClient.java
index 30dd1e0..1171eb8 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CourseStuddentClient.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CourseStuddentClient.java
@@ -2,11 +2,13 @@
import com.dsh.course.dto.ClassListDto;
import com.dsh.course.dto.updateTimeDto;
+import com.dsh.course.entity.CoursePackageOrderStudent;
import com.dsh.course.feignClient.course.model.TCoursePackagePayment;
import com.dsh.course.model.MoneyBack;
import com.dsh.course.model.dto.InsertBackDto;
import com.dsh.course.model.dto.StudentClassInfo;
import com.dsh.guns.modular.system.model.CourseCounsum;
+import com.dsh.guns.modular.system.model.CoursePackageOrder;
import com.dsh.guns.modular.system.model.dto.ConsumeQuery;
import com.dsh.guns.modular.system.model.dto.SelectDto;
import com.dsh.guns.modular.system.model.dto.ToClassDto;
@@ -89,12 +91,11 @@
@RequestMapping(value = "/courdent/toHoli",produces = MediaType.APPLICATION_JSON_UTF8_VALUE, consumes = "application/json;charset=UTF-8")
String toHoli(@RequestBody ToHoliDto toHoliDto);
@RequestMapping(value = "/courdent/toTrans",produces = MediaType.APPLICATION_JSON_UTF8_VALUE, consumes = "application/json;charset=UTF-8")
-
String toTrans(@RequestBody ToHoliDto toHoliDto);
@RequestMapping("/courdent/queryByIds")
- List<TCoursePackagePayment> queryByIds(@RequestParam("ids")String ids);
+ List<CoursePackageOrderStudent> queryByIds(@RequestParam("ids")String ids);
@RequestMapping("/courdent/queryCounsum")
@@ -107,7 +108,7 @@
@PostMapping("/courdent/insertBack")
- void insertBack(@RequestBody InsertBackDto insertBackDto);
+ Integer insertBack(@RequestBody InsertBackDto insertBackDto);
@RequestMapping("/courdent/changeStatus")
void changeStatus(@RequestParam("id")Integer id);
@@ -121,4 +122,6 @@
@RequestMapping("/courdent/backStausClass")
void backStausClass(@RequestParam("id")Integer id);
+ @RequestMapping("/courdent/getOrder")
+ List<CoursePackageOrder> getOrder(@RequestParam("id")Long id);
}
--
Gitblit v1.7.1