cloud-server-account/src/main/java/com/dsh/account/controller/ClassDetailsController.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.dsh.account.entity.TStudent; import com.dsh.account.feignclient.competition.model.PurchaseRecordVo; import com.dsh.account.model.vo.classDetails.ClasspaymentRequest; import com.dsh.account.model.vo.classDetails.classInsVo.*; import com.dsh.account.model.vo.commentDetail.StuCommentsVo; import com.dsh.account.model.vo.medalDetail.GongVo; @@ -28,7 +29,6 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.List; @@ -292,12 +292,15 @@ @PostMapping("/api/startCource/payment") @ApiOperation(value = "课时详情-支付", tags = {"APP-开始上课"}) @ApiImplicitParams({ @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....") @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."), }) public ResultUtil<?> continuationOperation(@RequestBody Integer lessonId, @RequestBody Integer stuId, HttpServletRequest request){ public ResultUtil continuationOperation(@RequestBody ClasspaymentRequest request){ try { return ResultUtil.success(); Integer userIdFormRedis = tokenUtil.getUserIdFormRedis(); if(null == userIdFormRedis){ return ResultUtil.tokenErr(); } return istuService.renewClassPayment(userIdFormRedis,request); }catch (Exception e){ return ResultUtil.runErr(); } @@ -374,7 +377,7 @@ */ @ResponseBody @PostMapping("/api/startCource/afterSourceDetails") @ApiOperation(value = "学员勋章", tags = {"APP-开始上课"}) @ApiOperation(value = "课后视频课表", tags = {"APP-开始上课"}) @ApiImplicitParams({ @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."), @ApiImplicitParam(value = "学员id", name = "stuId", required = true, dataType = "int"), cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CoursePaymentClient.java
@@ -1,9 +1,6 @@ package com.dsh.account.feignclient.course; import com.dsh.account.feignclient.course.model.CourseOfStoreVo; import com.dsh.account.feignclient.course.model.StuCourseResp; import com.dsh.account.feignclient.course.model.StuWithCoursesListVo; import com.dsh.account.feignclient.course.model.StudentOfCourseVo; import com.dsh.account.feignclient.course.model.*; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -29,4 +26,7 @@ StudentOfCourseVo getStudentCourse(@RequestParam("courseId") Integer courseId, @RequestParam("stuId") Integer stuId, @RequestParam("appUserId") Integer appUserId); @PostMapping("/base/coursePack/afterCourseTwos") List<AfterVideoVo> getAfterCourseTwos(@RequestParam("appUserId") Integer appUserId); } cloud-server-account/src/main/java/com/dsh/account/service/TStudentService.java
@@ -4,6 +4,7 @@ import com.dsh.account.entity.TStudent; import com.dsh.account.feignclient.competition.model.PurchaseRecordVo; import com.dsh.account.feignclient.other.model.SysNotice; import com.dsh.account.model.vo.classDetails.ClasspaymentRequest; import com.dsh.account.model.vo.classDetails.classInsVo.ClassDetailsInsVo; import com.dsh.account.model.vo.classDetails.classInsVo.StuDetailsReq; import com.dsh.account.model.vo.classDetails.classInsVo.StuListVo; @@ -14,6 +15,7 @@ import com.dsh.account.model.vo.sourceDetail.CouponStuAvailableVo; import com.dsh.account.model.vo.sourceDetail.CourseDetailsOfContinuationResp; import com.dsh.account.model.vo.sourceDetail.RecordTimeRequest; import com.dsh.account.util.ResultUtil; import java.util.List; @@ -69,4 +71,6 @@ */ List<StuListVo> switchStudentActions(Integer appUserId, Integer stuId); ResultUtil renewClassPayment(Integer userIdFormRedis, ClasspaymentRequest request); } cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
@@ -135,7 +135,6 @@ List<ExerciseVideo> videos = new ArrayList<>(); classInfoVo.setExerciseVideoList(videos); }else { classInfoVo.setIsThere(2); cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java
@@ -26,6 +26,7 @@ import com.dsh.account.mapper.CoachMapper; import com.dsh.account.mapper.TAppUserMapper; import com.dsh.account.mapper.TStudentMapper; import com.dsh.account.model.vo.classDetails.ClasspaymentRequest; import com.dsh.account.model.vo.classDetails.classInsVo.ClassDetailsInsVo; import com.dsh.account.model.vo.classDetails.classInsVo.StuDetailsReq; import com.dsh.account.model.vo.classDetails.classInsVo.StuListVo; @@ -39,6 +40,7 @@ import com.dsh.account.service.TStudentService; import com.dsh.account.util.DateTimeHelper; import com.dsh.account.util.DateUtil; import com.dsh.account.util.ResultUtil; import com.dsh.account.util.ToolUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -301,4 +303,37 @@ return purchaseRecords; } @Override public ResultUtil renewClassPayment(Integer userIdFormRedis, ClasspaymentRequest request) { // TODO: 2023/7/5 switch (request.getPayType()){ case 1: WeChatPayment(); break; case 2: AlipayPayment(); break; case 3: PlaypaiGoldPayment(); break; default: break; } return ResultUtil.success(); } public void WeChatPayment(){ } public void AlipayPayment(){ } public void PlaypaiGoldPayment(){ } } cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
@@ -7,6 +7,7 @@ import com.dsh.course.entity.TCoursePackagePayment; import com.dsh.course.feignclient.model.*; import com.dsh.course.model.dto.DiscountJsonDto; import com.dsh.course.service.PostCourseVideoService; import com.dsh.course.service.TCoursePackageDiscountService; import com.dsh.course.service.TCoursePackagePaymentService; import com.dsh.course.service.TCoursePackageService; @@ -44,6 +45,9 @@ @Autowired private TCoursePackageDiscountService tcpdService; @Autowired private PostCourseVideoService pcvService; private final SimpleDateFormat format = new SimpleDateFormat("MM-dd HH:mm"); @@ -253,4 +257,17 @@ 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; } } cloud-server-course/src/main/java/com/dsh/course/entity/TCoursePackage.java
@@ -106,18 +106,6 @@ */ private Integer validDays; /** * 课后练习课程id */ private Integer courseId; /** * 课后练习视频介绍 */ private String introduce; /** * 完成课后练习获取积分 */ private Integer integral; /** * 课程状态（1=未开始，2=进行中，3=已结束，4=已取消） */ private Integer status; cloud-server-course/src/main/java/com/dsh/course/feignclient/CoursePaymentClient.java
@@ -1,10 +1,7 @@ package com.dsh.course.feignclient; import com.dsh.course.feignclient.model.CourseOfStoreVo; import com.dsh.course.feignclient.model.StuCourseResp; import com.dsh.course.feignclient.model.StuWithCoursesListVo; import com.dsh.course.feignclient.model.StudentOfCourseVo; import com.dsh.course.feignclient.model.*; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -30,4 +27,7 @@ @RequestParam("stuId") Integer stuId, @RequestParam("appUserId") Integer appUserId); @PostMapping("/base/coursePack/afterCourseTwos") List<AfterVideoVo> getAfterCourseTwos(@RequestParam("appUserId") Integer appUserId); }
