nickchange
2023-10-24 d564437576c8f3f826bf4a08cf071b5b412efb46
10.24
5个文件已修改
80 ■■■■■ 已修改文件
cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java 40 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-course/src/main/java/com/dsh/course/mapper/CoursePackageSchedulingMapper.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-course/src/main/java/com/dsh/course/service/ICoursePackageSchedulingService.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageSchedulingServiceImpl.java 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-course/src/main/resources/mapper/CoursePackageSchedulingMapper.xml 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
@@ -760,17 +760,41 @@
            if(null == appUserId){
                return ResultUtil.tokenErr();
            }
            List<Integer> courseIds = new ArrayList<>();
            QueryWrapper<TCoursePackagePayment> queryWrapper = new QueryWrapper<TCoursePackagePayment>().eq("appUserId", appUserId)
                    .groupBy("coursePackageId");
//
//            List<Integer> courseIds = new ArrayList<>();
//            QueryWrapper<TCoursePackagePayment> queryWrapper = new QueryWrapper<TCoursePackagePayment>().eq("appUserId", appUserId)
//                    .groupBy("coursePackageId");
//            if (ToolUtil.isNotEmpty(search.getCourseTypeId())){
//                queryWrapper.eq("coursePackageId",search.getCourseTypeId());
//            }
//            List<TCoursePackagePayment> tCoursePackagePayments = packagePaymentService.list(queryWrapper);
//            if (tCoursePackagePayments.size() > 0 ){
//                courseIds = tCoursePackagePayments.stream().map(TCoursePackagePayment::getCoursePackageId).collect(Collectors.toList());
//            }
            QueryWrapper<CoursePackageStudent> queryWrapper1 = new QueryWrapper<CoursePackageStudent>().eq("appUserId", appUserId);
            if (ToolUtil.isNotEmpty(search.getCourseTypeId())){
                queryWrapper.eq("coursePackageId",search.getCourseTypeId());
                queryWrapper1.eq("coursePackageId",search.getCourseTypeId());
            }
            List<TCoursePackagePayment> tCoursePackagePayments = packagePaymentService.list(queryWrapper);
            if (tCoursePackagePayments.size() > 0 ){
                courseIds = tCoursePackagePayments.stream().map(TCoursePackagePayment::getCoursePackageId).collect(Collectors.toList());
            List<CoursePackageStudent> list = coursePackageStudentService.list(queryWrapper1);
            List<Long> longs = new ArrayList<>();
            for (CoursePackageStudent coursePackageStudent : list) {
                longs.add(coursePackageStudent.getCoursePackageSchedulingId());
            }
            return ResultUtil.success(packagePaymentService.queryAfterVideo(search,courseIds));
           List<CoursePackageScheduling> coursePackageSchedulings = coursePackageSchedulingService.list(new QueryWrapper<CoursePackageScheduling>().in("id",longs).isNotNull("courseId"));
           List<AppUserVideoResponse> coursePackageSchedulings1 = coursePackageSchedulingService.queryAll();
            return ResultUtil.success(coursePackageSchedulings1);
        }catch (Exception e){
            return ResultUtil.runErr();
        }
cloud-server-course/src/main/java/com/dsh/course/mapper/CoursePackageSchedulingMapper.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dsh.course.entity.CoursePackageScheduling;
import com.dsh.course.model.QueryCoursePackageSchedulingList;
import com.dsh.course.model.vo.response.AppUserVideoResponse;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -23,4 +24,8 @@
     * @return
     */
    List<Map<String, Object>> queryCoursePackageSchedulingList(Page<Map<String, Object>> page, @Param("item") QueryCoursePackageSchedulingList queryCoursePackageSchedulingList);
    List<AppUserVideoResponse> queryAll();
    boolean isHave(Integer videoId);
}
cloud-server-course/src/main/java/com/dsh/course/service/ICoursePackageSchedulingService.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.dsh.course.entity.CoursePackageScheduling;
import com.dsh.course.model.QueryCoursePackageSchedulingList;
import com.dsh.course.model.vo.response.AppUserVideoResponse;
import java.util.List;
import java.util.Map;
@@ -34,4 +35,6 @@
     * 定时修改状态
     */
    void taskSetStatus();
    List<AppUserVideoResponse> queryAll();
}
cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageSchedulingServiceImpl.java
@@ -8,6 +8,7 @@
import com.dsh.course.entity.TCoursePackage;
import com.dsh.course.mapper.CoursePackageSchedulingMapper;
import com.dsh.course.model.QueryCoursePackageSchedulingList;
import com.dsh.course.model.vo.response.AppUserVideoResponse;
import com.dsh.course.service.CoursePackageStudentService;
import com.dsh.course.service.ICoursePackageSchedulingService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -135,4 +136,22 @@
            }
        }).start();
    }
    @Override
    public List<AppUserVideoResponse> queryAll() {
        List<AppUserVideoResponse> appUserVideoResponses = this.baseMapper.queryAll();
        for (AppUserVideoResponse appUserVideoRespon : appUserVideoResponses) {
            if (this.baseMapper.isHave(appUserVideoRespon.getVideoId())){
                    appUserVideoRespon.setStudyStatus(1);
            }else {
                appUserVideoRespon.setStudyStatus(0);
            }
        }
            return appUserVideoResponses;
    }
}
cloud-server-course/src/main/resources/mapper/CoursePackageSchedulingMapper.xml
@@ -29,4 +29,17 @@
        order by classDate desc
    </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
        FROM t_course_package_scheduling3 cs
                 LEFT JOIN t_course tc ON cs.courseId = tc.id
    </select>
    <select id="isHave" resultType="java.lang.Boolean">
        SELECT EXISTS(SELECT 1 FROM t_user_video_details WHERE courseId = #{videoId})
    </select>
</mapper>