From ce166b832f583e9d6840601c000242e5676297f8 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期一, 29 一月 2024 14:47:15 +0800
Subject: [PATCH] 11.27,9
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java | 70 +++++++++++++++++++++++++++--------
1 files changed, 54 insertions(+), 16 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 a01b63e..f60f2d6 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
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.dsh.course.dto.*;
+import com.dsh.course.entity.CoursePackageOrderStudent;
import com.dsh.course.entity.EvaluateStudent;
import com.dsh.course.feignClient.account.AppUserClient;
import com.dsh.course.feignClient.account.StudentClient;
@@ -39,6 +40,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import javax.management.relation.RelationService;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
@@ -197,18 +199,31 @@
String formattedDate = dateFormat.format(new Date());
model.addAttribute("reDate", formattedDate);
- List<TCoursePackagePayment> coursePackagePayments = courseStuddentClient.queryByIds(ids);
+ List<CoursePackageOrderStudent> coursePackagePayments = courseStuddentClient.queryByIds(ids);
BigDecimal countAll = new BigDecimal(0);
- for (TCoursePackagePayment payment : coursePackagePayments){
+ for (CoursePackageOrderStudent payment : coursePackagePayments){
//课包名称
TCoursePackage tCoursePackage = coursePackageClient.queryById(payment.getCoursePackageId());
+ List<CoursePackageOrder> ordes = courseStuddentClient.getOrder(payment.getId());
+
+
+
payment.setName(tCoursePackage.getName());
payment.setId(Long.valueOf(tCoursePackage.getId()));
- BigDecimal cashPayment = payment.getCashPayment();
+
+ BigDecimal cashPayment = BigDecimal.ZERO;
+ for (CoursePackageOrder order : ordes) {
+ BigDecimal cashPayment1 = order.getCashPayment();
+ if (cashPayment1 != null) {
+ cashPayment = cashPayment.add(cashPayment1);
+ }
+ }
+ payment.setCashPayment(cashPayment);
+// BigDecimal cashPayment = payment.getCashPayment();
if (cashPayment==null){
cashPayment = BigDecimal.ZERO;
}
@@ -289,6 +304,11 @@
return PREFIX + "tStudentEdit_first.html";
}
+ @Autowired
+ private IMenuService menuService;
+
+ @Autowired
+ private IRelationService relationService;
@RequestMapping("/tStudent_info/{tStudentId}")
public String tStudentInfo(@PathVariable("tStudentId") Integer tStudentId, Model model) {
System.out.println("======>t"+tStudentId);
@@ -330,6 +350,17 @@
System.out.println("=======controller====studentClassInfo==="+studentClassInfo);
+
+
+ User user = UserExt.getUser();
+
+ List<Relation> list = relationService.list(new QueryWrapper<Relation>().eq("menuid", 391).eq("roleid", user.getRoleid()));
+ if (!list.isEmpty()){
+ model.addAttribute("back",false);
+ }else {
+ model.addAttribute("back",true);
+ }
+
return PREFIX + "tStudentEdit.html";
}
@@ -551,11 +582,14 @@
insertBackDto.setIds(ids);
System.out.println("=====insertBackDto========"+insertBackDto);
- courseStuddentClient.insertBack(insertBackDto);
+ Integer i = courseStuddentClient.insertBack(insertBackDto);
+ if (i == 1){
+ return ResultUtil.error("当前课程已在退费申请中");
+ }
//取消排课
- courseStuddentClient.cancel(ids);
- System.out.println("============学员查询接口=========");
+// courseStuddentClient.cancel(ids);
+// System.out.println("============学员查询接口=========");
return ResultUtil.success();
}
@@ -573,7 +607,7 @@
courseStuddentClient.zeroClass(id);
System.out.println("============学员查询接口=========");
- return new ResultUtil<>(0,0,"同意成功",null,null);
+ return new ResultUtil<>(0,0,"已同意",null,null);
}
@RequestMapping("/noStatus/{id}")
@@ -589,7 +623,7 @@
// courseStuddentClient.zeroClass(id);
System.out.println("============学员查询接口=========");
- return new ResultUtil<>(0,0,"同意成功",null,null);
+ return new ResultUtil<>(0,0,"已拒绝",null,null);
}
/**
@@ -774,10 +808,10 @@
System.out.println("========ToHoliDto========="+resultUtil);
- if (resultUtil==""||resultUtil==null){
- return new ResultUtil<>(0,0,"报名成功");
+ if (resultUtil.equals("报名成功")){
+ return new ResultUtil<>(0,0,resultUtil);
}else{
- return new ResultUtil<>(0,0,"报名成功，以下学员剩余课时不足"+resultUtil);}
+ return new ResultUtil<>(0,1,resultUtil);}
}
@@ -798,12 +832,16 @@
String resultUtil = courseStuddentClient.toTrans(toHoliDto);
System.out.println("========ToHoliDto========="+resultUtil);
+ if (resultUtil.equals("换课成功")) {
+// return ResultUtil.success(resultUtil);
+ return new ResultUtil<>(0,0,resultUtil);
- if (resultUtil==""){
- return new ResultUtil<>(0,0,"报名成功");
- }else{
- return new ResultUtil<>(0,0,"报名成功，以下学员剩余课时不足"+resultUtil);}
- }
+ }else {
+ return new ResultUtil<>(0,1,resultUtil);}
+ }
+// if (resultUtil==""){
+// }else{
+
//赠课
--
Gitblit v1.7.1