cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CoursePaymentClient.java
@@ -13,7 +13,7 @@ @PostMapping("/base/coursePack/queryPayment") List<StuCourseResp> getStuCoursePayment(); List<StuCourseResp> getStuCoursePayment(@RequestBody Integer stuId); @PostMapping("/base/coursePack/storeOfCourse") cloud-server-account/src/main/java/com/dsh/account/model/vo/classDetails/RegisteredCourse.java
@@ -12,6 +12,13 @@ @ApiModelProperty(value = "课程名称") private String courseName; @ApiModelProperty(value = "总学时数") private Integer totalNums; @ApiModelProperty(value = "已扣学时数") private Integer deductedNums; @ApiModelProperty(value = "剩余学时数") private Integer remainingNums; } cloud-server-account/src/main/java/com/dsh/account/model/vo/classDetails/classInsVo/ClassInfoVo.java
@@ -47,15 +47,6 @@ @ApiModelProperty(value = "课包-已报名课程列表") private List<RegisteredCourse> courseList; @ApiModelProperty(value = "总学时数") private Integer totalNums; @ApiModelProperty(value = "已扣学时数") private Integer deductedNums; @ApiModelProperty(value = "剩余学时数") private Integer remainingNums; @ApiModelProperty(value = "课程-课后练习视频2个列表") private List<ExerciseVideo> exerciseVideoList; cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
@@ -149,29 +149,19 @@ classInfoVo.setBodyStatus(BMIBodyUtil.getBodyStatus(tStudent.getBmi())); List<RegisteredCourse> courseList = new ArrayList<>(); // 总学时数 int total = 0; // 已扣数 int deduct = 0; // 剩余数 int remain = 0; List<StuCourseResp> stuCoursePayment = paymentClient.getStuCoursePayment(); List<StuCourseResp> stuCoursePayment = paymentClient.getStuCoursePayment(tStudent.getId()); if (stuCoursePayment.size() > 0){ for (StuCourseResp tCoursePackagePayment : stuCoursePayment) { RegisteredCourse course = new RegisteredCourse(); course.setCourseId(tCoursePackagePayment.getCourseId()); course.setCourseName(tCoursePackagePayment.getCourseName()); total = total + (ToolUtil.isEmpty(tCoursePackagePayment.getTotalCourseNums()) ? 0 : tCoursePackagePayment.getTotalCourseNums()); deduct = deduct + (ToolUtil.isEmpty(tCoursePackagePayment.getDeductionNums()) ? 0 : tCoursePackagePayment.getDeductionNums()); remain = remain + (ToolUtil.isEmpty(tCoursePackagePayment.getResidueNums())? 0 : tCoursePackagePayment.getResidueNums()); course.setTotalNums(ToolUtil.isEmpty(tCoursePackagePayment.getTotalCourseNums()) ? 0 : tCoursePackagePayment.getTotalCourseNums()); course.setDeductedNums(ToolUtil.isEmpty(tCoursePackagePayment.getDeductionNums()) ? 0 : tCoursePackagePayment.getDeductionNums()); course.setRemainingNums(ToolUtil.isEmpty(tCoursePackagePayment.getResidueNums())? 0 : tCoursePackagePayment.getResidueNums()); courseList.add(course); } } classInfoVo.setCourseList(courseList); classInfoVo.setTotalNums(total); classInfoVo.setDeductedNums(deduct); classInfoVo.setRemainingNums(remain); List<ExerciseVideo> videos = new ArrayList<>();
@@ -98,10 +98,16 @@ * @return 课包列表 */ @PostMapping("/base/coursePack/queryPayment") public List<StuCourseResp> getStuCoursePackagePayment(@RequestParam("stuId") Integer stuId,@RequestParam("appUserId") Integer appUserId){ public List<StuCourseResp> getStuCoursePackagePayment(@RequestBody Integer stuId){ Integer userIdFormRedis = null; try { userIdFormRedis = tokenUtil.getUserIdFormRedis(); } catch (Exception e) { throw new RuntimeException(e); } List<StuCourseResp> resps = new ArrayList<>(); List<TCoursePackagePayment> byUserId = packagePaymentService.list(new QueryWrapper<TCoursePackagePayment>() .eq("appUserId",appUserId) .eq("appUserId",userIdFormRedis) .eq("studentId",stuId)); if (byUserId.size() > 0 ){ cloud-server-course/src/main/java/com/dsh/course/feignclient/CoursePaymentClient.java
@@ -16,7 +16,7 @@ @PostMapping("/base/coursePack/queryPayment") List<StuCourseResp> getStuCoursePayment(); List<StuCourseResp> getStuCoursePayment(@RequestBody Integer stuId); @PostMapping("/base/coursePack/storeOfCourse") List<CourseOfStoreVo> getStoreOfCourses(@RequestBody WeeksOfCourseRest courseRest);
