From 220a3bb5570350c4a50e535771d0c10e0e357350 Mon Sep 17 00:00:00 2001 From: wuchunlei Date: Thu, 13 Jun 2024 15:17:43 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=88=90=E5=8A=9F?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=AE=9E=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/common/controller/CourseGuestbookController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/peanut/modules/common/controller/CourseGuestbookController.java b/src/main/java/com/peanut/modules/common/controller/CourseGuestbookController.java index 84a58557..edcca70f 100644 --- a/src/main/java/com/peanut/modules/common/controller/CourseGuestbookController.java +++ b/src/main/java/com/peanut/modules/common/controller/CourseGuestbookController.java @@ -30,7 +30,7 @@ public class CourseGuestbookController { @RequestMapping("/addCourseGuestbook") public R addCourseGuestbook(@RequestBody CourseGuestbook courseGuestbook){ service.save(courseGuestbook); - return R.ok(); + return R.ok().put("courseGuestbook",service.getById(courseGuestbook.getId())); } @RequestMapping("/addCourseGuestbookSupport") From 25706c5f8300d69586493749290ca229e81fe18f Mon Sep 17 00:00:00 2001 From: wuchunlei Date: Thu, 13 Jun 2024 15:58:57 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=88=90=E5=8A=9F=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E5=AE=9E=E4=BD=93=E6=B7=BB=E5=8A=A0user=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/controller/CourseGuestbookController.java | 7 ++++++- .../common/service/impl/CourseGuestbookServiceImpl.java | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/peanut/modules/common/controller/CourseGuestbookController.java b/src/main/java/com/peanut/modules/common/controller/CourseGuestbookController.java index edcca70f..1fa1b429 100644 --- a/src/main/java/com/peanut/modules/common/controller/CourseGuestbookController.java +++ b/src/main/java/com/peanut/modules/common/controller/CourseGuestbookController.java @@ -5,6 +5,7 @@ import com.peanut.common.utils.R; import com.peanut.modules.common.entity.CourseGuestbook; import com.peanut.modules.common.entity.CourseGuestbookSupport; import com.peanut.modules.common.service.CourseGuestbookService; +import com.peanut.modules.common.service.MyUserService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; @@ -20,6 +21,8 @@ public class CourseGuestbookController { @Autowired private CourseGuestbookService service; + @Autowired + private MyUserService userService; @RequestMapping("/getCourseGuestbookList") public R getCourseGuestbookList(@RequestBody Map map){ @@ -30,7 +33,9 @@ public class CourseGuestbookController { @RequestMapping("/addCourseGuestbook") public R addCourseGuestbook(@RequestBody CourseGuestbook courseGuestbook){ service.save(courseGuestbook); - return R.ok().put("courseGuestbook",service.getById(courseGuestbook.getId())); + CourseGuestbook res = service.getById(courseGuestbook.getId()); + res.setUser(userService.getById(res.getUserId())); + return R.ok().put("courseGuestbook",res); } @RequestMapping("/addCourseGuestbookSupport") diff --git a/src/main/java/com/peanut/modules/common/service/impl/CourseGuestbookServiceImpl.java b/src/main/java/com/peanut/modules/common/service/impl/CourseGuestbookServiceImpl.java index 2722eb65..1cc4b58b 100644 --- a/src/main/java/com/peanut/modules/common/service/impl/CourseGuestbookServiceImpl.java +++ b/src/main/java/com/peanut/modules/common/service/impl/CourseGuestbookServiceImpl.java @@ -41,14 +41,14 @@ public class CourseGuestbookServiceImpl extends ServiceImpl courseGuestbookPage = this.getBaseMapper().selectPage(new Page<>(page, limit), wrapper); if (courseGuestbookPage != null&&courseGuestbookPage.getRecords().size() > 0){ for (CourseGuestbook courseGuestbook : courseGuestbookPage.getRecords()) { courseGuestbook.setUser(userDao.selectById(courseGuestbook.getUserId())); MPJLambdaWrapper w = new MPJLambdaWrapper(); w.eq(CourseGuestbook::getPid,courseGuestbook.getId()); - w.orderByAsc(CourseGuestbook::getCreateTime); + w.orderByDesc(CourseGuestbook::getCreateTime); List list = this.getBaseMapper().selectList(w); if (list.size() > 0) { for (CourseGuestbook c : list){ From a08281589ed70ea55c50967dc09f4cb70c1b4ed9 Mon Sep 17 00:00:00 2001 From: wuchunlei Date: Fri, 14 Jun 2024 10:32:35 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/service/impl/CourseGuestbookServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/com/peanut/modules/common/service/impl/CourseGuestbookServiceImpl.java b/src/main/java/com/peanut/modules/common/service/impl/CourseGuestbookServiceImpl.java index 1cc4b58b..a5870a48 100644 --- a/src/main/java/com/peanut/modules/common/service/impl/CourseGuestbookServiceImpl.java +++ b/src/main/java/com/peanut/modules/common/service/impl/CourseGuestbookServiceImpl.java @@ -74,6 +74,9 @@ public class CourseGuestbookServiceImpl extends ServiceImpl Date: Fri, 14 Jun 2024 18:02:21 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E8=AF=A6=E7=BB=86?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AF=BE=E7=A8=8B=E5=85=B3=E8=81=94=E5=95=86?= =?UTF-8?q?=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sociology/service/impl/CourseServiceImpl.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/main/java/com/peanut/modules/sociology/service/impl/CourseServiceImpl.java b/src/main/java/com/peanut/modules/sociology/service/impl/CourseServiceImpl.java index a24ed7fe..d8ae011d 100644 --- a/src/main/java/com/peanut/modules/sociology/service/impl/CourseServiceImpl.java +++ b/src/main/java/com/peanut/modules/sociology/service/impl/CourseServiceImpl.java @@ -12,6 +12,7 @@ import com.peanut.modules.common.service.MyUserService; import com.peanut.modules.common.to.ParamTo; import com.peanut.modules.sociology.service.CourseService; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.*; @@ -42,6 +43,8 @@ public class CourseServiceImpl extends ServiceImpl impl private UserCourseStudyingDao studyingDao; @Autowired private MyUserDao userDao; + @Autowired + private ShopProductDao shopProductDao; //根据标签获取课程列表 @@ -103,6 +106,14 @@ public class CourseServiceImpl extends ServiceImpl impl //基础信息 CourseEntity course = this.getById(id); flag.put("course",course); + //课程关联商品 + if (StringUtils.isNotEmpty(course.getRelationProductIds())){ + String[] ids = course.getRelationProductIds().split(","); + List shopProductList = shopProductDao.selectList(new LambdaQueryWrapper() + .in(ShopProduct::getProductId, ids) + .orderByAsc(ShopProduct::getSort)); + flag.put("shopProductList",shopProductList); + } //目录信息 List courseCatalogueEntities = courseCatalogueDao.selectList(new LambdaQueryWrapper().eq(CourseCatalogueEntity::getCourseId, id).orderByAsc(CourseCatalogueEntity::getSort)); Integer uId = ShiroUtils.getUId(); From 510a0d6fdeb89e4d681f8a140ba79ab56bae79ff Mon Sep 17 00:00:00 2001 From: wuchunlei Date: Mon, 17 Jun 2024 13:10:34 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E8=AF=A6=E7=BB=86?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AF=BE=E7=A8=8B=E5=85=B3=E8=81=94=E5=95=86?= =?UTF-8?q?=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../master/controller/CourseController.java | 19 ++++++++++++++++++- .../modules/master/service/CourseService.java | 3 +++ .../service/impl/CourseServiceImpl.java | 18 ++++++++++++++++-- 3 files changed, 37 insertions(+), 3 deletions(-) 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 e91b46ec..97ac8430 100644 --- a/src/main/java/com/peanut/modules/master/controller/CourseController.java +++ b/src/main/java/com/peanut/modules/master/controller/CourseController.java @@ -9,6 +9,7 @@ import com.peanut.modules.common.to.ParamTo; import com.peanut.modules.common.to.ChangeCatalogueFeeDto; import com.peanut.modules.master.service.*; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -32,6 +33,8 @@ public class CourseController { private CourseCatalogueChapterVideoService courseCatalogueChapterVideoService; @Autowired private SysCourseDirectService sysCourseDirectService; + @Autowired + private ShopProductService shopProductService; @RequestMapping("/getCourseList") @@ -60,7 +63,15 @@ public class CourseController { @RequestMapping("/getCoursedetail") public R getCoursedetail(@RequestBody ParamTo param){ CourseEntity course = courseService.getById(param.getId()); - return R.ok().put("course",course); + List shopProductList = null; + //课程关联商品 + if (StringUtils.isNotEmpty(course.getRelationProductIds())){ + String[] ids = course.getRelationProductIds().split(","); + shopProductList = shopProductService.list(new LambdaQueryWrapper() + .in(ShopProduct::getProductId, ids) + .orderByAsc(ShopProduct::getSort)); + } + return R.ok().put("course",course).put("shopProductList",shopProductList); } @RequestMapping("/getCourseCatalogues") @@ -195,6 +206,12 @@ public class CourseController { return R.ok(); } + @RequestMapping("/getProductListForCourse") + public R getProductListForCourse(@RequestBody Map param){ + Page shopProductListhopProducts = courseService.getProductListForCourse(param); + return R.ok().put("shopProductListhopProducts",shopProductListhopProducts); + } + } 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 72ee38f6..076d3b6c 100644 --- a/src/main/java/com/peanut/modules/master/service/CourseService.java +++ b/src/main/java/com/peanut/modules/master/service/CourseService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.peanut.common.utils.R; import com.peanut.modules.common.entity.CourseEntity; +import com.peanut.modules.common.entity.ShopProduct; import com.peanut.modules.common.to.ParamTo; import java.util.List; @@ -30,4 +31,6 @@ public interface CourseService extends IService { R courseCatalogueTransfer(Map param); R getCourseLableLinkList(Map param); + + Page getProductListForCourse(Map param); } 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 fe9f667e..4f3a3a09 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 @@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.peanut.common.utils.ObjectUtils; import com.peanut.common.utils.R; -import com.peanut.modules.book.service.CouponProductRelationService; import com.peanut.modules.common.dao.*; import com.peanut.modules.common.entity.*; import com.peanut.modules.common.to.ParamTo; @@ -15,7 +14,6 @@ import com.peanut.modules.master.service.CourseService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; - import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; @@ -289,6 +287,22 @@ public class CourseServiceImpl extends ServiceImpl impl return R.ok().put("resList",resList); } + @Override + public Page getProductListForCourse(Map param) { + Integer limit = Integer.valueOf(param.get("limit").toString()); + Integer page = Integer.valueOf(param.get("page").toString()); + CourseEntity c = this.getOne(new LambdaQueryWrapper().eq(CourseEntity::getId,param.get("courseId"))); + Page resPage = null; + LambdaQueryWrapper w = new LambdaQueryWrapper<>(); + w.like(ShopProduct::getProductName,param.get("productName")); + if (StringUtils.isNotBlank(c.getRelationProductIds())){ + String[] productIds = c.getRelationProductIds().split(","); + w.notIn(ShopProduct::getProductId,productIds); + } + resPage = shopProductDao.selectPage(new Page<>(page, limit), w); + return resPage; + } + private CourseMedicine getPCourseMedicine(CourseMedicine m){ if (m.getPid()!=0){ CourseMedicine pm = medicalDao.selectById(m.getPid());