cloud-server-account/src/main/java/com/dsh/account/controller/ClassDetailsController.java
@@ -592,16 +592,16 @@ @ApiImplicitParam(value = "时间类型 0=全部 1=近一周 2=近一个月 3=近一年", name = "timeType", required = false, dataType = "int"), @ApiImplicitParam(value = "课程名称", name = "appointStatus", required = false, dataType = "string"), }) public ResultUtil<List<RecordAppoint>> cgeClassAppointmentRecordList(Integer stuId, Integer appointStatus, Integer timeType, String search){ try { public ResultUtil<List<RecordAppoint>> cgeClassAppointmentRecordList(Integer stuId, Integer appointStatus, Integer timeType, String search,Integer pageNum){ // try { Integer appUserId = tokenUtil.getUserIdFormRedis(); if(null == appUserId){ return ResultUtil.tokenErr(); } return ResultUtil.success(istuService.getAppointmentRecords(stuId,appUserId,appointStatus,timeType,search)); }catch (Exception e){ return ResultUtil.runErr(); } return ResultUtil.success(istuService.getAppointmentRecords(stuId,appUserId,appointStatus,timeType,search,pageNum)); // }catch (Exception e){ // return ResultUtil.runErr(); // } }
@@ -13,5 +13,8 @@ @PostMapping("/base/courseVideo/getAllList") List<ExerciseVideo> getStuCourseOfVideoList(@RequestBody List<Integer> coursePackIds); @PostMapping("/base/courseVideo/query") List<ExerciseVideo> query(@RequestBody Integer id); } cloud-server-account/src/main/java/com/dsh/account/feignclient/course/model/WeeksOfCourseRest.java
@@ -15,4 +15,5 @@ @ApiModelProperty(value = "时间 ") private String time; private Integer pageNum; } cloud-server-account/src/main/java/com/dsh/account/service/TStudentService.java
@@ -87,7 +87,7 @@ * @param appUserId * @return */ List<RecordAppoint> getAppointmentRecords(Integer stuId, Integer appUserId, Integer appointStatus, Integer timeType, String search); List<RecordAppoint> getAppointmentRecords(Integer stuId, Integer appUserId, Integer appointStatus, Integer timeType, String search,Integer pageNum); ResultUtil cancelReservationOfCourse( Integer courseStuRecordId);
@@ -651,10 +651,11 @@ * @return */ @Override public List<RecordAppoint> getAppointmentRecords(Integer stuId, Integer appUserId,Integer appointStatus,Integer timeType,String search) { public List<RecordAppoint> getAppointmentRecords(Integer stuId, Integer appUserId,Integer appointStatus,Integer timeType,String search,Integer pageNum) { WeeksOfCourseRest courseRest = new WeeksOfCourseRest(); courseRest.setAppUserId(appUserId); courseRest.setStuId(stuId); courseRest.setPageNum(pageNum); List<RecordAppoint> recordAppoints = couPayClient.obtainStudentClassDetailsData(courseRest); if (recordAppoints.size() > 0) { if (ToolUtil.isNotEmpty(appointStatus) && appointStatus != 0) { cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
@@ -1294,12 +1294,12 @@ @ResponseBody @PostMapping("/base/coursePack/obtainStudentClassDetails") public List<RecordAppoint> obtainStudentClassDetailsData(@RequestBody WeeksOfCourseRest stuId){ try { return packagePaymentService.obtainStuClassDetails(stuId.getStuId(),stuId.getAppUserId()); }catch (Exception e){ e.printStackTrace(); throw new RuntimeException(); } // try { return packagePaymentService.obtainStuClassDetails(stuId.getStuId(),stuId.getAppUserId(),stuId.getPageNum()); // }catch (Exception e){ // e.printStackTrace(); // throw new RuntimeException(); // } }
@@ -1,8 +1,18 @@ package com.dsh.course.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.dsh.course.entity.CoursePackageScheduling; import com.dsh.course.entity.CoursePackageStudent; import com.dsh.course.feignclient.model.ExerciseVideo; import com.dsh.course.mapper.CoursePackageSchedulingMapper; import com.dsh.course.model.vo.response.AppUserVideoResponse; import com.dsh.course.service.CoursePackageStudentService; import com.dsh.course.service.ICoursePackageSchedulingService; import com.dsh.course.service.PostCourseVideoService; import com.dsh.course.service.TCoursePackageDiscountService; import com.dsh.course.util.ToolUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -23,5 +33,47 @@ public List<ExerciseVideo> getStuCourseOfVideoList(@RequestBody List<Integer> coursePackIds){ return pcvService.queryCourseOfVideos(coursePackIds); } @Autowired private TCoursePackageDiscountService discountService; @Resource private CoursePackageSchedulingMapper coursePackageSchedulingMapper; @Autowired private ICoursePackageSchedulingService coursePackageSchedulingService; @Autowired private CoursePackageStudentService coursePackageStudentService; @ResponseBody @PostMapping("/base/courseVideo/query") public List<ExerciseVideo> query(@RequestBody Integer coursePackIds){ List<ExerciseVideo> exerciseVideoList = new ArrayList<>(); QueryWrapper<CoursePackageStudent> queryWrapper1 = new QueryWrapper<CoursePackageStudent>().eq("appUserId", 19); List<CoursePackageStudent> list = coursePackageStudentService.list(queryWrapper1); List<Long> longs = new ArrayList<>(); for (CoursePackageStudent coursePackageStudent : list) { longs.add(coursePackageStudent.getCoursePackageSchedulingId()); } System.out.println("======longs========"+longs); List<CoursePackageScheduling> coursePackageSchedulings = coursePackageSchedulingService.list(new QueryWrapper<CoursePackageScheduling>().in("id",longs).isNotNull("courseId")); List<AppUserVideoResponse> coursePackageSchedulings1 = coursePackageSchedulingService.queryAll(longs); for (AppUserVideoResponse appUserVideoResponse : coursePackageSchedulings1) { ExerciseVideo exerciseVideo = new ExerciseVideo(); exerciseVideo.setVideoId(appUserVideoResponse.getVideoId()); exerciseVideo.setVideoName(appUserVideoResponse.getVideoName()); exerciseVideo.setCoursePackageId(appUserVideoResponse.getCoursePackageId()); exerciseVideo.setVideoUrl(appUserVideoResponse.getCourseVideo()); exerciseVideo.setVideoCoverImgUrl(appUserVideoResponse.getCourseVideo());exerciseVideoList.add(exerciseVideo); } // return pcvService.queryCourseOfVideos(coursePackIds); return exerciseVideoList; } } cloud-server-course/src/main/java/com/dsh/course/feignclient/model/WeeksOfCourseRest.java
@@ -14,5 +14,6 @@ @ApiModelProperty(value = "时间 yyyy-MM-dd") private String time; private Integer pageNum; } cloud-server-course/src/main/java/com/dsh/course/model/vo/response/AppUserVideoResponse.java
@@ -31,4 +31,7 @@ @ApiModelProperty(value = "学习状态 1未学习 2已学习") private Integer studyStatus; @ApiModelProperty(value = "课程视频") private String courseVideo; } cloud-server-course/src/main/java/com/dsh/course/service/TCoursePackagePaymentService.java
@@ -87,7 +87,7 @@ * @param appUserId * @return */ List<RecordAppoint> obtainStuClassDetails(Integer stuId, Integer appUserId); List<RecordAppoint> obtainStuClassDetails(Integer stuId, Integer appUserId,Integer pageNum); ResultUtil insertVipPaymentCallback(String code, String orderNumber);
@@ -9,6 +9,7 @@ import com.alipay.api.response.AlipayTradeQueryResponse; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.dsh.course.entity.*; @@ -39,6 +40,8 @@ import com.dsh.course.util.*; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import io.swagger.models.auth.In; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpHeaders; @@ -50,6 +53,7 @@ import org.springframework.web.client.RestTemplate; import javax.annotation.Resource; import javax.persistence.criteria.CriteriaBuilder; import java.math.BigDecimal; import java.math.RoundingMode; import java.text.ParseException; @@ -731,7 +735,9 @@ @Override public List<RecordAppoint> obtainStuClassDetails(Integer stuId, Integer appUserId) { public List<RecordAppoint> obtainStuClassDetails(Integer stuId, Integer appUserId,Integer pageNum) { List<RecordAppoint> recordVoList = new ArrayList<>(); List<TCoursePackagePayment> tCoursePackagePayments = this.baseMapper.selectList(new QueryWrapper<TCoursePackagePayment>() .eq("studentId",stuId ) @@ -739,31 +745,58 @@ .eq("payStatus",2 ) .eq("status",1 ) .orderByDesc("insertTime")); List<Integer> ids = new ArrayList<>(); for (TCoursePackagePayment tCoursePackagePayment : tCoursePackagePayments) { ids.add(tCoursePackagePayment.getCoursePackageId()); } SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy.MM.dd"); SimpleDateFormat format = new SimpleDateFormat("yyyy.MM.dd HH:mm"); if (tCoursePackagePayments.size() > 0 ){ for (TCoursePackagePayment tCoursePackagePayment : tCoursePackagePayments) { List<CoursePackageStudent> coursePackageStudent1 = cpsMapper.selectList(new QueryWrapper<CoursePackageStudent>() .eq("coursePackageId",tCoursePackagePayment.getCoursePackageId() ) .eq("studentId",stuId) .eq("appUserId",appUserId) .eq("reservationStatus",1)); if (ToolUtil.isNotEmpty(coursePackageStudent1) && coursePackageStudent1.size() > 0){ // int pageNum = 1; // 页码 int pageSize = 10; // 每页记录数 Page<CoursePackageStudent> page = new Page<>(pageNum, pageSize); // for (TCoursePackagePayment tCoursePackagePayment : tCoursePackagePayments) { // List<CoursePackageStudent> coursePackageStudent1 = cpsMapper.selectList(new QueryWrapper<CoursePackageStudent>() // .in("coursePackageId",ids) // .eq("studentId",stuId) // .eq("appUserId",appUserId) // .eq("reservationStatus",1)); IPage<CoursePackageStudent> coursePackageStudentPage = cpsMapper.selectPage(page, new QueryWrapper<CoursePackageStudent>() .in("coursePackageId", ids) .eq("studentId", stuId) .eq("appUserId", appUserId) .eq("reservationStatus", 1)); List<CoursePackageStudent> coursePackageStudent1 = coursePackageStudentPage.getRecords(); if (ToolUtil.isNotEmpty(coursePackageStudent1) && coursePackageStudent1.size() > 0){ TCoursePackage coursePackage = new TCoursePackage(); Integer coursePackageId = -1; for (CoursePackageStudent coursePackageStudent : coursePackageStudent1) { RecordAppoint recordVo = new RecordAppoint(); recordVo.setCoursePackageId(tCoursePackagePayment.getCoursePackageId()); recordVo.setCoursePackageId(coursePackageStudent.getCoursePackageId()); TCoursePackage coursePackage = tcpmapper.selectById(tCoursePackagePayment.getCoursePackageId()); if (!coursePackageStudent.getCoursePackageId().equals(coursePackageId)) { coursePackage = tcpmapper.selectById(coursePackageStudent.getCoursePackageId()); coursePackageId = coursePackageStudent.getCoursePackageId(); } recordVo.setUserId(appUserId); recordVo.setSiteId(coursePackage.getSiteId()); List<Integer> ids = getIds(coursePackage.getSiteId()); recordVo.setIds(ids); List<Integer> ids1 = getIds(coursePackage.getSiteId()); recordVo.setIds(ids1); recordVo.setCoursePackageName(coursePackage.getName()); recordVo.setCourseHours(tCoursePackagePayment.getClassHours()); for (TCoursePackagePayment tCoursePackagePayment : tCoursePackagePayments) { if (Objects.equals(coursePackageStudent.getCoursePackageId(), tCoursePackagePayment.getCoursePackageId())){ recordVo.setCourseHours(tCoursePackagePayment.getClassHours()); } } // recordVo.setCourseHours(tCoursePackagePayment.getClassHours()); Date date = DateUtil.getDate(); String classStartTime = coursePackage.getClassStartTime(); @@ -791,7 +824,7 @@ recordVo.setStatus(5); }else { CancelledClasses cancelledClasses = cacMapper.selectOne(new QueryWrapper<CancelledClasses>() .eq("coursePackageId",tCoursePackagePayment.getCoursePackageId() )); .eq("coursePackageId",coursePackageStudent.getCoursePackageId() )); if (ToolUtil.isNotEmpty(cancelledClasses)){ recordVo.setStatus(3); // 消课 到课状态0 旷课 @@ -814,7 +847,8 @@ } } } // } return recordVoList; } public List<Integer> getIds(Integer siteId) { cloud-server-course/src/main/resources/mapper/CoursePackageSchedulingMapper.xml
@@ -31,7 +31,7 @@ </select> <select id="queryAll" resultType="com.dsh.course.model.vo.response.AppUserVideoResponse"> SELECT cs.courseId as videoId,cs.coursePackageId as coursePackageId,tc.coverDrawing,tc.name as videoName,tc.introduce as synopsis,cs.integral SELECT cs.courseId as videoId,cs.coursePackageId as coursePackageId,tc.coverDrawing,tc.name as videoName,tc.introduce as synopsis,cs.integral,cs.courseVideo as courseVideo FROM t_course_package_scheduling cs LEFT JOIN t_course tc ON cs.courseId = tc.id WHERE cs.courseId IS NOT NULL and cs.id in cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_add1.html
@@ -113,6 +113,7 @@ "label": "所属门店：", "name": "store", "value":`${storeId!}`, "hidden": `${is3}`, "id": "u:576899b1b531", "multiple": false, "disabled": true, cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_edit1.html
@@ -199,6 +199,7 @@ "id": "u:576899b1b531", "multiple": false, "mode": "horizontal", "disabled": true, "size": "md", "horizontal": { "leftFixed": "lg" cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java
@@ -177,6 +177,8 @@ // List<SiteBooking> siteBookings = siteClient.listBooks(id); List<SiteBooking> siteBookings = iSiteBookingService.list(new QueryWrapper<SiteBooking>().eq("siteId", id).eq("nextName",siteName).like("times",day)); if (siteName==null|| siteName.equals("")){ siteBookings = iSiteBookingService.list(new QueryWrapper<SiteBooking>().eq("siteId", id).like("times",day)); }
