From c148720d31eb2f8d68352e64eaddf17fd5b66a5a Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 07 七月 2023 18:13:14 +0800
Subject: [PATCH] 合并代码
---
cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java | 191 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 181 insertions(+), 10 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
index e26735e..1a26b08 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
@@ -2,21 +2,31 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.dsh.course.entity.PostCourseVideo;
import com.dsh.course.entity.TCoursePackage;
+import com.dsh.course.entity.TCoursePackageDiscount;
import com.dsh.course.entity.TCoursePackagePayment;
-import com.dsh.course.feignclient.model.CourseOfStoreVo;
-import com.dsh.course.feignclient.model.StuCourseResp;
-import com.dsh.course.feignclient.model.StuSessionDetailsVo;
+import com.dsh.course.feignclient.model.*;
+import com.dsh.course.model.dto.DiscountJsonDto;
+import com.dsh.course.model.vo.CourseDetailRequest;
+import com.dsh.course.service.PostCourseVideoService;
+import com.dsh.course.service.TCoursePackageDiscountService;
import com.dsh.course.service.TCoursePackagePaymentService;
import com.dsh.course.service.TCoursePackageService;
import com.dsh.course.util.DateUtil;
+import com.dsh.course.util.StrUtils;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
import io.swagger.annotations.Api;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@@ -35,15 +45,23 @@
@Autowired
private TCoursePackageService tcpService;
+ @Autowired
+ private TCoursePackageDiscountService tcpdService;
+
+ @Autowired
+ private PostCourseVideoService pcvService;
+
+ private final SimpleDateFormat format = new SimpleDateFormat("MM-dd HH:mm");
+
/**
* 获取 没有学员信息的图片配置
* @param stuId 学员id
* @return 课包列表
*/
- @PostMapping("/coursePack/queryPayment")
- public List<StuCourseResp> getStuCoursePackagePayment(@RequestBody Integer stuId,@RequestBody Integer appUserId){
+ @PostMapping("/base/coursePack/queryPayment")
+ public List<StuCourseResp> getStuCoursePackagePayment(@RequestParam("stuId") Integer stuId,@RequestParam("appUserId") Integer appUserId){
List<StuCourseResp> resps = new ArrayList<>();
- List<TCoursePackagePayment> byUserId = packagePaymentService.queryAllCoursePackage(stuId,appUserId);
+ List<TCoursePackagePayment> byUserId = packagePaymentService.queryAllCoursePackage(null,null,null,stuId,appUserId);
if (byUserId.size() > 0 ){
for (TCoursePackagePayment tCoursePackagePayment : byUserId) {
TCoursePackage tCoursePackage = tcpService.getById(tCoursePackagePayment.getCoursePackageId());
@@ -63,7 +81,7 @@
*
* 获取发布的 课包列表
*/
- @PostMapping("/coursePack/storeOfCourse")
+ @PostMapping("/base/coursePack/storeOfCourse")
public List<CourseOfStoreVo> getStuCourseWithStores(){
List<CourseOfStoreVo> courseOfStoreVos = tcpService.queryStoreOfCourse();
if (courseOfStoreVos.size() > 0){
@@ -85,10 +103,10 @@
*
* 课程名称列表
*/
- @PostMapping("/coursePack/sessionNames")
- public List<StuSessionDetailsVo> getStuSessionList(@RequestBody Integer stuId,@RequestBody Integer appUserId){
+ @PostMapping("/base/coursePack/sessionNames")
+ public List<StuSessionDetailsVo> getStuSessionList(@RequestBody CourseDetailRequest request){
List<StuSessionDetailsVo> detailsVos = new ArrayList<>();
- List<TCoursePackagePayment> byUserId = packagePaymentService.queryAllCoursePackage(stuId,appUserId);
+ List<TCoursePackagePayment> byUserId = packagePaymentService.queryAllCoursePackage(request.getStartTime(),request.getEndTime(),null,request.getStuId(),request.getAppUserId());
if (byUserId.size() > 0){
List<Integer> collect = byUserId.stream().map(TCoursePackagePayment::getCoursePackageId).collect(Collectors.toList());
List<TCoursePackage> list = tcpService.list(new QueryWrapper<TCoursePackage>()
@@ -104,4 +122,157 @@
}
return detailsVos;
}
+
+ @PostMapping("/base/coursePack/paymentCourse")
+ public List<PurchaseRecordVo> queryCourseDetails(@RequestParam("startTime") Date startTime, @RequestParam("endTime") Date endTime,@RequestParam("stuId") Integer stuId, @RequestParam("appUserId") Integer appUserId) {
+ List<PurchaseRecordVo> purchaseRecordVos = new ArrayList<>();
+ List<TCoursePackagePayment> coursePackage = packagePaymentService.queryAllCoursePackage(startTime,endTime,null,stuId, appUserId);
+ if (coursePackage.size() > 0 ){
+ coursePackage.forEach( cspackage -> {
+ PurchaseRecordVo recordVo = new PurchaseRecordVo();
+ recordVo.setPurchaseAmount("+"+cspackage.getClassHours());
+ recordVo.setPurchaseTime(format.format(cspackage.getInsertTime()));
+ recordVo.setPurchaseType("购买课包");
+ purchaseRecordVos.add(recordVo);
+ });
+ }
+ return purchaseRecordVos;
+ }
+
+
+
+ @PostMapping("/base/coursePack/stuOfCourses")
+ public StuWithCoursesListVo getStuOfCoursesDetails(@RequestBody GetStuOfCoursesDetails getStuOfCoursesDetails){
+ StuWithCoursesListVo lisco = new StuWithCoursesListVo();
+ Integer totalNu = 0;
+ Integer dedutNu = 0;
+ Integer remainNu = 0;
+ List<TCoursePackagePayment> byUserId = packagePaymentService.queryAllCoursePackage(null,null,null,getStuOfCoursesDetails.getStuId(),getStuOfCoursesDetails.getAppUserId());
+ if (byUserId.size() > 0 ){
+ for (TCoursePackagePayment tCoursePackagePayment : byUserId) {
+ totalNu = totalNu + tCoursePackagePayment.getTotalClassHours();
+ dedutNu = dedutNu + tCoursePackagePayment.getLaveClassHours();
+ remainNu = remainNu + (tCoursePackagePayment.getTotalClassHours()-tCoursePackagePayment.getLaveClassHours());
+ }
+ lisco.setTotalNums(totalNu);
+ lisco.setDeductedNums(remainNu);
+ lisco.setRemainingNums(dedutNu);
+ }
+ return lisco;
+ }
+
+
+
+ @PostMapping("/base/coursePack/continuingCourse")
+ public StudentOfCourseVo getStudentCourse(@RequestBody GetStudentCourse getStudentCourse){
+ StudentOfCourseVo courseVo = new StudentOfCourseVo();
+ List<TCoursePackagePayment> tCoursePackagePayments = packagePaymentService.queryAllCoursePackage(null,null,getStudentCourse.getCourseId(),getStudentCourse.getStuId(),getStudentCourse.getAppUserId());
+ if (tCoursePackagePayments.size() > 0 ){
+
+ List<CourseHoursType> typeList = new ArrayList<>();
+ tCoursePackagePayments.forEach(cou -> {
+ CourseHoursType hoursType = new CourseHoursType();
+ hoursType.setCourseConfigId(cou.getId());
+ hoursType.setCourseHourNums(cou.getClassHours());
+ typeList.add(hoursType);
+ });
+ TCoursePackagePayment tCoursePackagePayment = tCoursePackagePayments.get(0);
+ courseVo.setCoursePackageId(tCoursePackagePayment.getCoursePackageId());
+ courseVo.setTypeList(typeList);
+
+ TCoursePackage coursePackage = tcpService.getById(tCoursePackagePayment.getCoursePackageId());
+ courseVo.setPackageImg(coursePackage.getCoverDrawing());
+ courseVo.setCourseName(coursePackage.getName());
+ courseVo.setCoachId(coursePackage.getCoachId());
+ String classWeeks = coursePackage.getClassWeeks();
+ List<Integer> integers = StrUtils.dealStrToList(classWeeks);
+ 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;
+ }
+ }
+ if (courWeeks.length() > 0 && courWeeks.charAt(courWeeks.length() - 1) == ','){
+ courWeeks.deleteCharAt(courWeeks.length() - 1);
+ }
+ courseVo.setCourseWeek(courWeeks.toString());
+ }
+
+ courseVo.setCourseTime(coursePackage.getClassStartTime()+"-"+coursePackage.getClassEndTime());
+ Integer payType = tCoursePackagePayment.getPayType();
+ BigDecimal cashPayment = tCoursePackagePayment.getCashPayment();
+ double cashPaymentValue = cashPayment.doubleValue();
+ Integer playPaiCoin = tCoursePackagePayment.getPlayPaiCoin();
+ TCoursePackageDiscount coursePackageDiscount = tcpdService.getOne(new QueryWrapper<TCoursePackageDiscount>()
+ .eq("coursePackageId",coursePackage.getId() )
+ .eq("type",1)
+ .eq("auditStatus",2));
+ ObjectMapper objectMapper = new ObjectMapper();
+ String content = coursePackageDiscount.getContent();
+ double discountMember = 0.0;
+ DiscountJsonDto discountJsonDto = null;
+ try {
+ discountJsonDto = objectMapper.readValue(content, DiscountJsonDto.class);
+ discountMember = discountJsonDto.getDiscountMember();
+ } catch (JsonProcessingException e) {
+ throw new RuntimeException(e);
+ }
+ switch (payType) {
+ case 1:
+ courseVo.setAmount(cashPaymentValue);
+ courseVo.setVipAmount(discountMember);
+ courseVo.setWpGold(playPaiCoin);
+ break;
+ case 2:
+ courseVo.setAmount(cashPaymentValue);
+ courseVo.setVipAmount(discountMember);
+ break;
+ case 3:
+ courseVo.setWpGold(playPaiCoin);
+ break;
+ }
+ courseVo.setStoreId(coursePackage.getStoreId());
+ }
+
+ return courseVo;
+ }
+
+
+ @PostMapping("/base/coursePack/afterCourseTwos")
+ public List<AfterVideoVo> getAfterCourseTwos(@RequestParam("appUserId") Integer appUserId){
+ List<AfterVideoVo> videoVos = new ArrayList<>();
+ List<TCoursePackagePayment> tCoursePackagePayments = packagePaymentService.queryAllCoursePackage(null,null,null,null,appUserId);
+ List<Integer> coursePackageIds = tCoursePackagePayments.stream().map(TCoursePackagePayment::getCoursePackageId).collect(Collectors.toList());
+// List<PostCourseVideo> videoList = pcvService.queryAllVideoNoneShow(coursePackageIds);
+ return videoVos;
+ }
+
+
+
+
+
+
}
--
Gitblit v1.7.1