From 339cd0750c25c02cf6d78937f0f51e4c31e83856 Mon Sep 17 00:00:00 2001
From: lisy <linlangsur163@163.com>
Date: 星期五, 04 八月 2023 11:20:55 +0800
Subject: [PATCH] app端：开始上课的课程列表的feign接口bug
---
cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java | 10 +++++++++-
cloud-server-account/src/main/java/com/dsh/account/controller/CoachController.java | 2 +-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/CoachController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/CoachController.java
index 63511df..03bf6a4 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/CoachController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/CoachController.java
@@ -23,7 +23,7 @@
*/
@ResponseBody
@PostMapping("/coach/queryCoachById")
- public Coach queryCoachById( Integer id){
+ public Coach queryCoachById(@RequestBody Integer id){
try {
return service.getById(id);
}catch (Exception e){
diff --git a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java
index 4c913de..160a3dd 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java
@@ -214,7 +214,9 @@
List<CoursePackageStudent> coursePackageStudents = cpsMapper.selectList(new QueryWrapper<CoursePackageStudent>()
.eq("coursePackageId",coursePackage.getId())
.eq("studentId",appUserId ));
- registerCourseVo.setCourseNums(coursePackageStudents.size() * 2);
+ if (coursePackageStudents.size() > 0 ){
+ registerCourseVo.setCourseNums(coursePackageStudents.size() * 2);
+ }
registerCourseVo.setPayStatus(tCoursePackagePayment.getPayStatus());
courseVos.add(registerCourseVo);
}
@@ -230,6 +232,12 @@
.filter(person -> Objects.equals(person.getCoursePackTypeId(), courseTypeId.getCourseTypeId()))
.collect(Collectors.toList());
}
+
+ if (courseVos.size() > 0 ){
+ courseVos = courseVos.stream()
+ .sorted(Comparator.comparingInt(person -> person.getPayStatus() == 1 ? -1 : 1))
+ .collect(Collectors.toList());
+ }
}
return courseVos;
}
--
Gitblit v1.7.1