From 02fb8cddb6c0ec60b6ba6d08beb673214d9b6959 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期一, 25 九月 2023 17:26:21 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java | 29 +++++++++++++++++++++++------
1 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java
index 5373667..7ac3954 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java
@@ -104,7 +104,7 @@
*/
@RequestMapping("/changelist/{payId}")
@ResponseBody
- public ResultUtil changelist(@PathVariable("payId") Integer payId, ConsumeQuery consumeQuery) {
+ public ResultUtil changelist(@PathVariable("payId") Long payId, ConsumeQuery consumeQuery) {
consumeQuery.setPayId(payId);
System.out.println("=======changelist==========="+consumeQuery);
List<CourseCounsum> courseCounsums = courseStuddentClient.queryCounsum(consumeQuery);
@@ -360,6 +360,8 @@
return ResultUtil.success();
}
+//同意退款
+
@RequestMapping("/changeStatus/{id}")
@ResponseBody
public ResultUtil changeStatus(@PathVariable Integer id) {
@@ -375,6 +377,21 @@
return new ResultUtil<>(0,0,"同意成功",null,null);
}
+ @RequestMapping("/noStatus/{id}")
+ @ResponseBody
+ public ResultUtil noStatus(@PathVariable Integer id) {
+// InsertBackDto insertBackDto= new InsertBackDto();
+// insertBackDto.setId(id);
+//// insertBackDto.setIds(ids);
+// System.out.println("=====insertBackDto========"+insertBackDto);
+
+ courseStuddentClient.changeStatus(id);
+ courseStuddentClient.backStausClass(id);
+// courseStuddentClient.zeroClass(id);
+
+ System.out.println("============学员查询接口=========");
+ return new ResultUtil<>(0,0,"同意成功",null,null);
+ }
/**
* 学员修改
@@ -430,7 +447,7 @@
historyClient.createHistory(historyDto);
- return ResultUtil.success();
+ return new ResultUtil<>(0,0,"更改成功",null,null);
}
@@ -453,7 +470,7 @@
*/
@RequestMapping(value = "/getUserSlect/{id}")
@ResponseBody
- public ResultUtil getUserSlect(@PathVariable("id") Integer payId) {
+ public ResultUtil getUserSlect(@PathVariable("id") Long payId) {
List<SelectDto> selectDtos = courseStuddentClient.getSelect(payId);
Map<String,List<SelectDto>> map = new HashMap<>();
@@ -466,7 +483,7 @@
*/
@RequestMapping(value = "/toClass")
@ResponseBody
- public ResultUtil toClass( Integer id,Integer toStudentId) {
+ public ResultUtil toClass( Long id,Integer toStudentId) {
ToClassDto toClassDto = new ToClassDto();
toClassDto.setToStudentId(toStudentId);
toClassDto.setId(id);
@@ -536,7 +553,7 @@
System.out.println("========ToHoliDto========="+resultUtil);
- if (resultUtil==""){
+ if (resultUtil==""||resultUtil==null){
return new ResultUtil<>(0,0,"报名成功");
}else
return new ResultUtil<>(0,0,"报名成功，以下学员剩余课时不足"+resultUtil);
@@ -570,7 +587,7 @@
@RequestMapping(value = "/giftTo")
@ResponseBody
- public ResultUtil toClagiftToss( Integer id,Integer toStudentId) {
+ public ResultUtil toClagiftToss( Long id,Integer toStudentId) {
ToClassDto toClassDto = new ToClassDto();
toClassDto.setToStudentId(toStudentId);
toClassDto.setId(id);
--
Gitblit v1.7.1