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..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(); + 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..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 @@ -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){ @@ -74,6 +74,9 @@ public class CourseGuestbookServiceImpl extends ServiceImpl 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()); 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 09b0f2b4..41887b11 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; //根据标签获取课程列表 @@ -106,6 +109,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();