From 730693c6546db5110cdf4ff736535c54e5bc971e Mon Sep 17 00:00:00 2001 From: wuchunlei Date: Tue, 11 Jun 2024 16:44:33 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E7=9B=AE=E5=BD=95=E8=BF=81?= =?UTF-8?q?=E7=A7=BB=20=E5=85=85=E5=80=BC=E8=AE=B0=E5=BD=95=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=B7=BB=E5=8A=A0vip=E8=AF=A6=E7=BB=86=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/CourseCatalogueChapterEntity.java | 5 ++ .../service/impl/BuyOrderServiceImpl.java | 5 ++ .../master/controller/CourseController.java | 8 ++++ .../modules/master/service/CourseService.java | 2 + .../CourseCatalogueChapterServiceImpl.java | 7 +++ .../service/impl/CourseServiceImpl.java | 46 +++++++++++++++++++ 6 files changed, 73 insertions(+) diff --git a/src/main/java/com/peanut/modules/common/entity/CourseCatalogueChapterEntity.java b/src/main/java/com/peanut/modules/common/entity/CourseCatalogueChapterEntity.java index da0cfeae..9ea79ef6 100644 --- a/src/main/java/com/peanut/modules/common/entity/CourseCatalogueChapterEntity.java +++ b/src/main/java/com/peanut/modules/common/entity/CourseCatalogueChapterEntity.java @@ -1,11 +1,13 @@ package com.peanut.modules.common.entity; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import java.util.Date; +import java.util.List; @Data @TableName("course_catalogue_chapter") @@ -31,4 +33,7 @@ public class CourseCatalogueChapterEntity { @TableLogic private Integer delFlag; + //视频列表 + @TableField(exist = false) + private List videoList; } diff --git a/src/main/java/com/peanut/modules/common/service/impl/BuyOrderServiceImpl.java b/src/main/java/com/peanut/modules/common/service/impl/BuyOrderServiceImpl.java index 5c6b12bf..7aa183a9 100644 --- a/src/main/java/com/peanut/modules/common/service/impl/BuyOrderServiceImpl.java +++ b/src/main/java/com/peanut/modules/common/service/impl/BuyOrderServiceImpl.java @@ -38,6 +38,8 @@ public class BuyOrderServiceImpl extends ServiceImpl impl private ExpressOrderDao expressOrderDao; @Autowired private BookBuyConfigDao bookBuyConfigDao; + @Autowired + private VipBuyConfigDao vipBuyConfigDao; @Override public Map initPrepareOrder(PrepareOrderDto prepareOrderDto) { @@ -86,6 +88,9 @@ public class BuyOrderServiceImpl extends ServiceImpl impl if (b.getProductId()!=null){ b.setBookBuyConfigEntity(bookBuyConfigDao.selectById(b.getProductId())); } + if (b.getVipBuyConfigId()!=0){ + b.setVipBuyConfigEntity(vipBuyConfigDao.selectById(b.getVipBuyConfigId())); + } //组装商品 List buyOrderProducts = buyOrderProductDao.selectList( new LambdaQueryWrapper().eq(BuyOrderProduct::getOrderId, b.getOrderId())); diff --git a/src/main/java/com/peanut/modules/master/controller/CourseController.java b/src/main/java/com/peanut/modules/master/controller/CourseController.java index 955757c6..e4ac25ef 100644 --- a/src/main/java/com/peanut/modules/master/controller/CourseController.java +++ b/src/main/java/com/peanut/modules/master/controller/CourseController.java @@ -155,6 +155,12 @@ public class CourseController { return R.ok().put("result",sysCourseDirectEntity); } + //课程目录迁移 + @RequestMapping("/courseCatalogueTransfer") + public R courseCatalogueTransfer(@RequestBody Map param){ + return courseService.courseCatalogueTransfer(param); + } + @@ -170,4 +176,6 @@ public class CourseController { return R.ok(); } + + } diff --git a/src/main/java/com/peanut/modules/master/service/CourseService.java b/src/main/java/com/peanut/modules/master/service/CourseService.java index 34a5590e..00a35538 100644 --- a/src/main/java/com/peanut/modules/master/service/CourseService.java +++ b/src/main/java/com/peanut/modules/master/service/CourseService.java @@ -26,4 +26,6 @@ public interface CourseService extends IService { void testCourse(); List courseAndChildrenList(Map params); + + R courseCatalogueTransfer(Map param); } diff --git a/src/main/java/com/peanut/modules/master/service/impl/CourseCatalogueChapterServiceImpl.java b/src/main/java/com/peanut/modules/master/service/impl/CourseCatalogueChapterServiceImpl.java index 453cdf6f..59caa718 100644 --- a/src/main/java/com/peanut/modules/master/service/impl/CourseCatalogueChapterServiceImpl.java +++ b/src/main/java/com/peanut/modules/master/service/impl/CourseCatalogueChapterServiceImpl.java @@ -29,6 +29,13 @@ public class CourseCatalogueChapterServiceImpl extends ServiceImpl page = this.page(new Page<>(param.getPage(), param.getLimit()), wrapper); + if (page.getRecords() != null&&page.getRecords().size() > 0){ + for (CourseCatalogueChapterEntity chapter:page.getRecords()){ + LambdaQueryWrapper videoWrapper = new LambdaQueryWrapper<>(); + videoWrapper.eq(CourseCatalogueChapterVideoEntity::getChapterId,chapter.getId()); + chapter.setVideoList(courseCatalogueChapterVideoDao.selectList(videoWrapper)); + } + } return page; } diff --git a/src/main/java/com/peanut/modules/master/service/impl/CourseServiceImpl.java b/src/main/java/com/peanut/modules/master/service/impl/CourseServiceImpl.java index b8bfa2b3..6d21262f 100644 --- a/src/main/java/com/peanut/modules/master/service/impl/CourseServiceImpl.java +++ b/src/main/java/com/peanut/modules/master/service/impl/CourseServiceImpl.java @@ -37,9 +37,13 @@ public class CourseServiceImpl extends ServiceImpl impl @Autowired private CourseCatalogueDao courseCatalogueDao; @Autowired + private CourseCatalogueChapterDao chapterDao; + @Autowired private ShopProductDao shopProductDao; @Autowired private ShopProductCourseDao shopProductCourseDao; + @Autowired + private UserCourseBuyDao userCourseBuyDao; @Override public Page getCourseList(Map map) { @@ -213,6 +217,48 @@ public class CourseServiceImpl extends ServiceImpl impl return courseList; } + @Override + public R courseCatalogueTransfer(Map param) { + String courseId = param.get("courseId").toString(); + CourseCatalogueEntity catalogueEntity = courseCatalogueDao.selectById(param.get("catalogueId").toString()); + if (catalogueEntity!=null){ + //修改课程目录 + catalogueEntity.setCourseId(Integer.parseInt(courseId)); + courseCatalogueDao.updateById(catalogueEntity); + //修改目录下章节的课程字段 + LambdaQueryWrapper chapterWrapper = new LambdaQueryWrapper<>(); + chapterWrapper.eq(CourseCatalogueChapterEntity::getCatalogueId,catalogueEntity.getId()); + List chapterList = chapterDao.selectList(chapterWrapper); + if (chapterList != null && chapterList.size() > 0) { + for (CourseCatalogueChapterEntity chapterEntity : chapterList) { + chapterEntity.setCourseId(Integer.parseInt(courseId)); + chapterDao.updateById(chapterEntity); + } + } + //修改商品课程下的课程字段 + LambdaQueryWrapper shopProductCourseWrapper = new LambdaQueryWrapper<>(); + shopProductCourseWrapper.eq(ShopProductCourseEntity::getCatalogueId,catalogueEntity.getId()); + List shopProductCourseList = shopProductCourseDao.selectList(shopProductCourseWrapper); + if (shopProductCourseList != null && shopProductCourseList.size() > 0) { + for (ShopProductCourseEntity spc : shopProductCourseList) { + spc.setCourseId(Integer.parseInt(courseId)); + shopProductCourseDao.updateById(spc); + } + } + //修改user_course_buy下的课程字段 + LambdaQueryWrapper userCourseBuyWrapper = new LambdaQueryWrapper<>(); + userCourseBuyWrapper.eq(UserCourseBuyEntity::getCatalogueId,catalogueEntity.getId()); + List userCourseBuyList = userCourseBuyDao.selectList(userCourseBuyWrapper); + if (userCourseBuyList != null && userCourseBuyList.size() > 0) { + for (UserCourseBuyEntity buy : userCourseBuyList) { + buy.setCourseId(Integer.parseInt(courseId)); + userCourseBuyDao.updateById(buy); + } + } + } + return R.ok(); + } + private List sociologyIds(Integer id){ ArrayList integers = new ArrayList<>();