diff --git a/src/main/java/com/peanut/modules/book/controller/ShopProductController.java b/src/main/java/com/peanut/modules/book/controller/ShopProductController.java index 328bc291..067c5ebf 100644 --- a/src/main/java/com/peanut/modules/book/controller/ShopProductController.java +++ b/src/main/java/com/peanut/modules/book/controller/ShopProductController.java @@ -247,7 +247,7 @@ public class ShopProductController { /** - * 获取关联订单列表 + * 获取关联商品列表 * * @param productId * @return diff --git a/src/main/java/com/peanut/modules/master/controller/CourseMedicineMarketController.java b/src/main/java/com/peanut/modules/master/controller/CourseMedicineMarketController.java index ce6c13d4..58cc6f43 100644 --- a/src/main/java/com/peanut/modules/master/controller/CourseMedicineMarketController.java +++ b/src/main/java/com/peanut/modules/master/controller/CourseMedicineMarketController.java @@ -121,16 +121,24 @@ public class CourseMedicineMarketController { /** * 获取营销标签下课程 */ +// @RequestMapping(path = "/getCourseByMarketId") +// public R getCourseByMarket(@RequestBody Map params) { +// MPJLambdaWrapper wrapper = new MPJLambdaWrapper(); +// wrapper.leftJoin(CourseEntity.class,CourseEntity::getId, CourseToMedicineMarketEntity::getCourseId); +// wrapper.selectAll(CourseEntity.class); +// wrapper.like(CourseEntity::getTitle,params.get("title")); +// wrapper.eq(CourseToMedicineMarketEntity::getMedicineMarketId,params.get("marketId")); +// Page res = toMarketService.pageMaps(new Page<>( +// Long.parseLong(params.get("current").toString()), Long.parseLong(params.get("limit").toString())), wrapper); +// return R.ok().put("result", res); +// } + + @RequestMapping(path = "/getCourseByMarketId") - public R getCourseByMarket(@RequestBody Map params) { - MPJLambdaWrapper wrapper = new MPJLambdaWrapper(); - wrapper.leftJoin(CourseEntity.class,CourseEntity::getId, CourseToMedicineMarketEntity::getCourseId); - wrapper.selectAll(CourseEntity.class); - wrapper.like(CourseEntity::getTitle,params.get("title")); - wrapper.eq(CourseToMedicineMarketEntity::getMedicineMarketId,params.get("marketId")); - Page res = toMarketService.pageMaps(new Page<>( - Long.parseLong(params.get("current").toString()), Long.parseLong(params.get("limit").toString())), wrapper); - return R.ok().put("result", res); + public R getCourseByMarketId(@RequestBody Map map){ + int marketId = map.get("marketId"); + List courseByMarketId = toMarketService.getCourseByMarketId(marketId); + return R.ok().put("list",courseByMarketId); } /** diff --git a/src/main/java/com/peanut/modules/master/service/CourseToMedicineMarketService.java b/src/main/java/com/peanut/modules/master/service/CourseToMedicineMarketService.java index 988650f4..cb8e0463 100644 --- a/src/main/java/com/peanut/modules/master/service/CourseToMedicineMarketService.java +++ b/src/main/java/com/peanut/modules/master/service/CourseToMedicineMarketService.java @@ -1,7 +1,12 @@ package com.peanut.modules.master.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.peanut.modules.common.entity.CourseEntity; import com.peanut.modules.common.entity.CourseToMedicineMarketEntity; +import java.util.List; + public interface CourseToMedicineMarketService extends IService { + + List getCourseByMarketId(int marketId); } diff --git a/src/main/java/com/peanut/modules/master/service/impl/CourseToMedicineMarketServiceImpl.java b/src/main/java/com/peanut/modules/master/service/impl/CourseToMedicineMarketServiceImpl.java index 5a8d9fcc..451f11cb 100644 --- a/src/main/java/com/peanut/modules/master/service/impl/CourseToMedicineMarketServiceImpl.java +++ b/src/main/java/com/peanut/modules/master/service/impl/CourseToMedicineMarketServiceImpl.java @@ -1,13 +1,28 @@ package com.peanut.modules.master.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.peanut.modules.common.dao.CourseToMedicineMarketDao; +import com.peanut.modules.common.entity.CourseEntity; import com.peanut.modules.common.entity.CourseToMedicineMarketEntity; import com.peanut.modules.master.service.CourseToMedicineMarketService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import java.util.List; + @Slf4j @Service("masterCourseToMarketService") public class CourseToMedicineMarketServiceImpl extends ServiceImpl implements CourseToMedicineMarketService { + + + @Override + public List getCourseByMarketId(int marketId) { + MPJLambdaWrapper wrapper = new MPJLambdaWrapper<>(); + wrapper.selectAll(CourseEntity.class); + wrapper.leftJoin(CourseEntity.class,CourseEntity::getId,CourseToMedicineMarketEntity::getCourseId); + wrapper.eq(CourseToMedicineMarketEntity::getMedicineMarketId,marketId); + List courseEntities = this.getBaseMapper().selectJoinList(CourseEntity.class, wrapper); + return courseEntities; + } }