From 525e21bf383c9cb4bfe18c72ebcb4fd6ef74db7c Mon Sep 17 00:00:00 2001
From: lisy <linlangsur163@163.com>
Date: 星期三, 09 八月 2023 12:01:36 +0800
Subject: [PATCH] app端口:积分兑换商品的支付流程
---
cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java | 105 ++++++++++++++++++++++++++++------------------------
1 files changed, 57 insertions(+), 48 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 7ac9917..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
@@ -2,6 +2,8 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
+import com.alipay.api.domain.Person;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.dsh.course.entity.*;
@@ -17,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;
@@ -108,9 +111,13 @@
@Override
public List<AppUserVideoResponse> queryAfterVideo(CourseOfAfterRequest search,List<Integer> courseIds) {
List<AppUserVideoResponse> responses = new ArrayList<>();
- List<PostCourseVideo> videoList = pcvMapper.selectList(new QueryWrapper<PostCourseVideo>()
- .eq("coursePackageId", courseIds));
-
+ List<PostCourseVideo> videoList = new ArrayList<>();
+ LambdaQueryWrapper<PostCourseVideo> queryWrapper = new LambdaQueryWrapper<PostCourseVideo>();
+ if (courseIds.size() > 0 ){
+ queryWrapper.in(PostCourseVideo::getCoursePackageId,courseIds);
+ }
+ videoList = pcvMapper.selectList(queryWrapper);
+ System.out.println(videoList);
if (videoList.size() > 0){
List<Integer> videoIds = videoList.stream().map(PostCourseVideo::getCourseId).collect(Collectors.toList());
List<UserVideoDetails> userVideoDetails = uvdmapper.selectList(new QueryWrapper<UserVideoDetails>()
@@ -124,23 +131,23 @@
BenefitsVideos videosWithIds = bfvoClient.getVideosWithIds(userVideoDetail.getCourseId());
response.setVideoId(userVideoDetail.getCourseId());
response.setCoverImage(videosWithIds.getCover());
- if (null != search.getSearch()){
-// 根据正则模糊匹配
- String pattern = ".*" + search.getSearch() + ".*";
- Pattern regex = Pattern.compile(pattern);
- Matcher matcher = regex.matcher(videosWithIds.getName());
- if (matcher.matches()) {
- response.setVideoName(videosWithIds.getName());
- }
- }else {
- response.setVideoName(videosWithIds.getName());
- }
+ response.setVideoName(videosWithIds.getName());
response.setSynopsis(videosWithIds.getIntroduction());
response.setIntegral(videosWithIds.getIntegral());
response.setStudyStatus(userVideoDetail.getState());
responses.add(response);
}
Collections.sort(responses, Comparator.comparing(AppUserVideoResponse::getStudyStatus));
+ }
+ if (ToolUtil.isNotEmpty(search.getSearch())){
+ responses = responses.stream()
+ .filter(person -> person.getPackageName().contains(search.getSearch()))
+ .collect(Collectors.toList());
+ }
+ if (ToolUtil.isNotEmpty(search.getCourseTypeId())){
+ responses = responses.stream()
+ .filter(person -> Objects.equals(person.getCoursePackageId(), search.getCourseTypeId()))
+ .collect(Collectors.toList());
}
}
return responses;
@@ -166,6 +173,7 @@
response.setPackageName(coursePackage.getName());
response.setSynopsis(videosWithIds.getIntroduction());
response.setDetailedDiagram(coursePackage.getIntroduceDrawing());
+ response.setCover(videosWithIds.getCover());
}
return response;
@@ -192,6 +200,7 @@
List<RegisterCourseVo> courseVos = new ArrayList<>();
List<TCoursePackagePayment> tCoursePackagePayments = this.list(new QueryWrapper<TCoursePackagePayment>()
.eq("appUserId",appUserId ));
+ System.out.println(tCoursePackagePayments);
if (tCoursePackagePayments.size() > 0){
for (TCoursePackagePayment tCoursePackagePayment : tCoursePackagePayments) {
TCoursePackage coursePackage = tcpmapper.selectById(tCoursePackagePayment.getCoursePackageId());
@@ -199,25 +208,46 @@
RegisterCourseVo registerCourseVo = new RegisterCourseVo();
registerCourseVo.setCoursePayId(tCoursePackagePayment.getId());
registerCourseVo.setCoursePackageId(tCoursePackagePayment.getCoursePackageId());
+ registerCourseVo.setCoursePackTypeId(coursePackage.getCoursePackageTypeId());
registerCourseVo.setPackageImg(coursePackage.getCoverDrawing());
String storeAndCourse = coursePackage.getName()+"("+ store.getName() +")";
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 ));
- registerCourseVo.setCourseNums(coursePackageStudents.size() * 2);
+ if (coursePackageStudents.size() > 0 ){
+ registerCourseVo.setCourseNums(coursePackageStudents.size() * 2);
+ }
registerCourseVo.setPayStatus(tCoursePackagePayment.getPayStatus());
courseVos.add(registerCourseVo);
+ }
+
+ if (ToolUtil.isNotEmpty(courseTypeId.getSearch())){
+ courseVos = courseVos.stream()
+ .filter(person -> person.getCourseNameStore().contains(courseTypeId.getSearch()))
+ .collect(Collectors.toList());
+ }
+
+ if (ToolUtil.isNotEmpty(courseTypeId.getCourseTypeId())){
+ courseVos = courseVos.stream()
+ .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;
}
@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);
@@ -231,33 +261,9 @@
if (integers.size() > 0){
StringBuilder courWeeks = new StringBuilder("每");
for (Integer integer : integers) {
- switch (integer){
- case 1:
- courWeeks.append("周一、");
- break;
- case 2:
- courWeeks.append("周二、");
- break;
- case 3:
- courWeeks.append("周三、");
- break;
- case 4:
- courWeeks.append("周四、");
- break;
- case 5:
- courWeeks.append("周五、");
- break;
- case 6:
- courWeeks.append("周六、");
- break;
- case 7:
- courWeeks.append("周末、");
- break;
- default:
- break;
- }
+ courWeeks.append(integer).append("、");
}
- if (courWeeks.length() > 0 && courWeeks.charAt(courWeeks.length() - 1) == ','){
+ if (courWeeks.length() > 0 && courWeeks.charAt(courWeeks.length() - 1) == '、'){
courWeeks.deleteCharAt(courWeeks.length() - 1);
}
response.setWeeks(courWeeks.toString());
@@ -579,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;
@@ -629,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