From 1901fceb6ddaa56a57f3131191454554c3e77e68 Mon Sep 17 00:00:00 2001
From: guohongjin <guohongjin@test.com>
Date: 星期三, 01 五月 2024 13:56:51 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PsychologicalCounseling
---
common-buiness/src/main/java/cn/stylefeng/guns/modular/business/service/impl/CourseOrderServiceImpl.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/common-buiness/src/main/java/cn/stylefeng/guns/modular/business/service/impl/CourseOrderServiceImpl.java b/common-buiness/src/main/java/cn/stylefeng/guns/modular/business/service/impl/CourseOrderServiceImpl.java
index edf48e3..8de6c5e 100644
--- a/common-buiness/src/main/java/cn/stylefeng/guns/modular/business/service/impl/CourseOrderServiceImpl.java
+++ b/common-buiness/src/main/java/cn/stylefeng/guns/modular/business/service/impl/CourseOrderServiceImpl.java
@@ -73,7 +73,8 @@
@Override
public CourseOrderResponseDTO getCourseChapterInfoByOrderId(Long orderId) {
- CourseOrderResponseDTO courseOrderResponseDTO = BeanUtil.copyProperties(this.getById(orderId),CourseOrderResponseDTO.class);
+ CourseOrder byId = this.getById(orderId);
+ CourseOrderResponseDTO courseOrderResponseDTO = BeanUtil.copyProperties(byId,CourseOrderResponseDTO.class);
//查询章节信息
List<CourseChapter> courseChapterList = this.courseChapterService.getAllByCourseId(courseOrderResponseDTO.getCourseId());
//查询章节学习进度
@@ -92,6 +93,21 @@
List<CourseResponseDTO.CourseChapterResponseDTO> courseChapterResponseDTOList = new ArrayList<>();
courseChapterResponseDTOList = turnChapterResponseDTO(courseChapterResponseDTOList,courseChapterList,learnMap);
courseOrderResponseDTO.setCourseChapterResponseDTOList(courseChapterResponseDTOList);
+
+ if (byId.getUserId()!=null) {
+ Customer byId1 = customerService.getById(byId.getUserId());
+ courseOrderResponseDTO.setUserName(byId1.getNickName());
+ }
+ if (byId.getCourseUserId()!=null) {
+ Customer byId1 = customerService.getById(byId.getCourseUserId());
+ courseOrderResponseDTO.setCourseUserName(byId1.getNickName());
+ }
+ if (byId.getTutoringUserId()!=null) {
+ Customer byId1 = customerService.getById(byId.getTutoringUserId());
+ courseOrderResponseDTO.setTutoringUserName(byId1.getNickName());
+ }
+
+
return courseOrderResponseDTO;
}
--
Gitblit v1.7.1