From eb6b6dbb35a9f029e0b7d269773685c19fd40976 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 11 七月 2024 10:47:51 +0800
Subject: [PATCH] 玩湃微信商户认证代码
---
cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageStudentServiceImpl.java | 33 +++++++++++++++++++++------------
1 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageStudentServiceImpl.java b/cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageStudentServiceImpl.java
index ed9a9e5..11b940e 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageStudentServiceImpl.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageStudentServiceImpl.java
@@ -47,12 +47,12 @@
private StudentClient studentClient;
-
@Autowired
private CoursePackageSchedulingMapper coursePackageSchedulingService;
/**
* 获取排课预约数据
+ *
* @param queryCoursePackageStudentList
* @return
*/
@@ -60,22 +60,23 @@
public List<Map<String, Object>> queryCoursePackageStudentList(Page<Map<String, Object>> page, QueryCoursePackageStudentList queryCoursePackageStudentList) {
List<Integer> userId = null;
List<Integer> studentId = null;
- if(ToolUtil.isNotEmpty(queryCoursePackageStudentList.getUserName())){
+ if (ToolUtil.isNotEmpty(queryCoursePackageStudentList.getUserName())) {
List<AppUser> appUsers = appUserClient.queryAppUserListByName(queryCoursePackageStudentList.getUserName());
- if(appUsers.size() > 0){
+ if (appUsers.size() > 0) {
userId = appUsers.stream().map(AppUser::getId).collect(Collectors.toList());
}
}
- if(ToolUtil.isNotEmpty(queryCoursePackageStudentList.getStudentName())){
+ if (ToolUtil.isNotEmpty(queryCoursePackageStudentList.getStudentName())) {
List<Student> students = studentClient.queryStudentListByName(queryCoursePackageStudentList.getStudentName());
- if(students.size() > 0){
+ if (students.size() > 0) {
studentId = students.stream().map(Student::getId).collect(Collectors.toList());
}
}
CoursePackageScheduling coursePackageScheduling = coursePackageSchedulingService.selectById(queryCoursePackageStudentList.getCoursePackageSchedulingId());
- List<CoursePackageScheduling> coursePackageSchedulings = coursePackageSchedulingService.selectList(new QueryWrapper<CoursePackageScheduling>().eq("coursePackageId", coursePackageScheduling.getCoursePackageId()).eq("classDate", coursePackageScheduling.getClassDate()));
+ List<CoursePackageScheduling> coursePackageSchedulings = coursePackageSchedulingService.selectList(new QueryWrapper<CoursePackageScheduling>()
+ .eq("coursePackageId", coursePackageScheduling.getCoursePackageId()).eq("classDate", coursePackageScheduling.getClassDate()));
List<Long> ids = new ArrayList<>();
@@ -90,12 +91,16 @@
Integer appUserId = Integer.valueOf(map.get("appUserId").toString());
Integer student_Id = Integer.valueOf(map.get("studentId").toString());
TAppUser appUser = appUserClient.queryAppUser1(appUserId);
+ if(null != appUser){
+ map.put("userName", appUser.getName());
+ map.put("phone", appUser.getPhone());
+ }
Student student = studentClient.queryStudentById(student_Id);
- map.put("userName", appUser.getName());
- map.put("phone", student.getPhone());
- map.put("studentName", student.getName());
- map.put("age", null != student.getBirthday() ? now - Integer.valueOf(sdf.format(student.getBirthday())) : "-");
- map.put("sex", student.getSex());
+ if(null != student){
+ map.put("studentName", student.getName());
+ map.put("age", null != student.getBirthday() ? now - Integer.valueOf(sdf.format(student.getBirthday())) : "-");
+ map.put("sex", student.getSex());
+ }
}
return list;
}
@@ -107,7 +112,11 @@
@Override
public List<ClassListDto> getClassList(Integer tStudentId) {
- return this.baseMapper.getClassList(tStudentId);
+ List<ClassListDto> classList = this.baseMapper.getClassList(tStudentId);
+ List<ClassListDto> holiList = this.baseMapper.getHoliList(tStudentId);
+ classList.addAll(holiList);
+
+ return classList;
}
@Override
--
Gitblit v1.7.1