From b38caa7012b8da89d5ca61d389258d4fd8d9172e Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 09 八月 2023 17:51:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
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 8b0ad37..a8eb953 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
@@ -19,6 +19,7 @@
import com.dsh.course.feignclient.other.StoreClient;
import com.dsh.course.feignclient.other.model.Store;
import com.dsh.course.mapper.*;
+import com.dsh.course.model.BillingRequest;
import com.dsh.course.model.dto.DiscountJsonDto;
import com.dsh.course.model.vo.RegisterCourseVo;
import com.dsh.course.model.vo.request.ClasspaymentRequest;
@@ -172,6 +173,7 @@
response.setPackageName(coursePackage.getName());
response.setSynopsis(videosWithIds.getIntroduction());
response.setDetailedDiagram(coursePackage.getIntroduceDrawing());
+ response.setCover(videosWithIds.getCover());
}
return response;
@@ -212,7 +214,7 @@
registerCourseVo.setCourseNameStore(storeAndCourse);
registerCourseVo.setCourseTime(coursePackage.getClassStartTime()+"-"+coursePackage.getClassEndTime());
Coach coach = coachClient.queryCoachById(coursePackage.getCoachId());
- registerCourseVo.setCourseTeacher(coach.getName());
+ registerCourseVo.setCourseTeacher(ToolUtil.isEmpty(coach) ? "" : coach.getName());
List<CoursePackageStudent> coursePackageStudents = cpsMapper.selectList(new QueryWrapper<CoursePackageStudent>()
.eq("coursePackageId",coursePackage.getId())
.eq("studentId",appUserId ));
@@ -245,7 +247,7 @@
}
@Override
- public CourseDetailsResponse queryRegisteredCourseDetails(Integer coursePayId, Integer appUserId) {
+ public CourseDetailsResponse queryRegisteredCourseDetails(Long coursePayId, Integer appUserId) {
CourseDetailsResponse response = new CourseDetailsResponse();
TCoursePackagePayment tCoursePackagePayment = this.baseMapper.selectById(coursePayId);
@@ -583,12 +585,10 @@
recordVo.setCourseStuRecordId(coursePackageStudent.getId());
String classWeeks = coursePackage.getClassWeeks();
String[] split = classWeeks.split(";");
- List<Integer> integerList = Arrays.stream(split)
- .map(Integer::parseInt)
- .collect(Collectors.toList());
- int dayOfWeek = DateTimeHelper.getDayOfWeek(new Date());
+ List<String> integerList = Arrays.asList(split);
+ String weekOfDate = DateTimeHelper.getWeekOfDate(new Date());
- if (integerList.contains(dayOfWeek)){
+ if (integerList.contains(weekOfDate)){
String dat = simpleDateFormat.format(date) +" "+ classStartTime;
Date start = null;
@@ -633,5 +633,10 @@
return ResultUtil.success();
}
+ @Override
+ public List<BillingRequest> queryAmountDatas(Integer appUserId, String monthStart, String monthEnd) {
+ return this.baseMapper.billingDataRequestVo(appUserId,monthStart,monthEnd);
+ }
+
}
--
Gitblit v1.7.1