From 40c0d0e862607b764e11432957807d799c10a945 Mon Sep 17 00:00:00 2001 From: wangjinlei <751475802@qq.com> Date: Mon, 20 May 2024 18:06:57 +0800 Subject: [PATCH 01/13] bug --- .../CourseSociologyMarketController.java | 205 ++++++++++-------- .../CourseToSociologyMarketService.java | 5 + .../CourseToSociologyMarketServiceImpl.java | 14 ++ 3 files changed, 134 insertions(+), 90 deletions(-) diff --git a/src/main/java/com/peanut/modules/master/controller/CourseSociologyMarketController.java b/src/main/java/com/peanut/modules/master/controller/CourseSociologyMarketController.java index 96be1ee1..3a45b167 100644 --- a/src/main/java/com/peanut/modules/master/controller/CourseSociologyMarketController.java +++ b/src/main/java/com/peanut/modules/master/controller/CourseSociologyMarketController.java @@ -3,8 +3,10 @@ package com.peanut.modules.master.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.peanut.common.utils.ObjectUtils; import com.peanut.common.utils.R; import com.peanut.modules.common.entity.*; +import com.peanut.modules.common.to.ParamTo; import com.peanut.modules.master.service.*; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; @@ -15,6 +17,7 @@ import org.springframework.web.bind.annotation.RestController; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; @Slf4j @RestController("masterCourseSociologyMarket") @@ -37,58 +40,41 @@ public class CourseSociologyMarketController { return R.ok().put("result", courseSociologyMarketEntities); } - /** - * 获取营销标签列表 - */ - @RequestMapping(path = "/getMakertListByPid") - public R getMakertListByPid(String pid) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper(); - wrapper.eq(CourseSociologyMarketEntity::getPid,pid); - wrapper.orderByAsc(CourseSociologyMarketEntity::getSort); - wrapper.orderByAsc(CourseSociologyMarketEntity::getCreateTime); - List marketTopList = marketService.list(wrapper); - return R.ok().put("result", marketTopList); - } - @RequestMapping(path = "/getMarketById") - public R getMarketById(String id) { + public R getMarketById(@RequestBody Map map) { + int id = map.get("id"); return R.ok().put("result",marketService.getById(id)); } - @RequestMapping(path = "/saveOrUpdateMarket") - public R saveOrUpdateMarket(@RequestBody CourseSociologyMarketEntity market) { - if (market.getId()==null){ - if(market.getPid()==0){ - marketService.save(market); - return R.ok().put("result",market); - }else { - CourseSociologyMarketEntity m = marketService.getById(market.getPid()); - if (m.getIsLast()==1){ - return R.error("请将父标签设置为非最后一集"); - }else { - marketService.save(market); - return R.ok().put("result",market); - } - } - }else { - if (market.getIsLast() == 1){ - List mList = marketService.list(new LambdaQueryWrapper() - .eq(CourseSociologyMarketEntity::getPid,market.getId())); - if (mList.size()>0){ - return R.error("请先删除子集，再设置为最后一集"); - }else { - marketService.saveOrUpdate(market); - return R.ok().put("result",market); - } - }else { - marketService.saveOrUpdate(market); - return R.ok().put("result",market); + @RequestMapping("/addSociologyMarket") + public R addSociologyMarket(@RequestBody CourseSociologyMarketEntity courseSociologyMarketEntity){ + marketService.save(courseSociologyMarketEntity); + return R.ok(); + } + + @RequestMapping("/editSociologyMarket") + public R editSociologyMarket(@RequestBody CourseSociologyMarketEntity courseSociologyMarketEntity){ + CourseSociologyMarketEntity old = marketService.getById(courseSociologyMarketEntity.getId()); + if(courseSociologyMarketEntity.getIsLast()==1&&old.getIsLast()==0){//非终节点到终结点，要排除是否存在子集 + Integer integer = marketService.getBaseMapper().selectCount(new LambdaQueryWrapper().eq(CourseSociologyMarketEntity::getPid, courseSociologyMarketEntity.getId())); + if(integer>0){ + return R.error("请先清空子集再操作！"); } } + + if(courseSociologyMarketEntity.getIsLast()==0&&old.getIsLast()==1){ + Integer integer = toMarketService.getBaseMapper().selectCount(new LambdaQueryWrapper().eq(CourseToSociologyMarketEntity::getSociologyMarketId, courseSociologyMarketEntity.getId())); + if(integer>0){ + return R.error("请先清空绑定的课程后，再操作"); + } + } + marketService.save(courseSociologyMarketEntity); + return R.ok(); } @RequestMapping(path = "/delMarket") - public R delMarket(String id) { + public R delMarket(@RequestBody Map map) { + int id = map.get("id"); CourseSociologyMarketEntity market = marketService.getById(id); if (market.getIsLast()==1){ MPJLambdaWrapper wrapper = new MPJLambdaWrapper(); @@ -111,66 +97,105 @@ public class CourseSociologyMarketController { } } + @RequestMapping("/getCourseListByMarketId") + public R getCourseListByMarketId(@RequestBody Map map){ + List marketId = toMarketService.getCourseListByMarketId(map.get("marketId")); + return R.ok().put("courseList",marketId); + } + /** * 获取营销标签下课程 */ - @RequestMapping(path = "/getCourseByMarketId") - public R getCourseByMarket(@RequestBody Map params) { - MPJLambdaWrapper wrapper = new MPJLambdaWrapper(); - wrapper.leftJoin(CourseEntity.class,CourseEntity::getId, CourseToSociologyMarketEntity::getCourseId); - wrapper.selectAll(CourseEntity.class); - wrapper.like(CourseEntity::getTitle,params.get("title")); - wrapper.eq(CourseToSociologyMarketEntity::getSociologyMarketId,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, CourseToSociologyMarketEntity::getCourseId); +// wrapper.selectAll(CourseEntity.class); +// wrapper.like(CourseEntity::getTitle,params.get("title")); +// wrapper.eq(CourseToSociologyMarketEntity::getSociologyMarketId,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("/getNotToMarketList") + public R getNotToMarketList(@RequestBody ParamTo param){ + List collect = toMarketService.getBaseMapper().selectList(new LambdaQueryWrapper().eq(CourseToSociologyMarketEntity::getSociologyMarketId, param.getId())).stream().map(CourseToSociologyMarketEntity::getCourseId).collect(Collectors.toList()); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.notIn(collect.size()>0,CourseEntity::getId,collect); + wrapper.like(StringUtils.isNotBlank(param.getKeywords()),CourseEntity::getTitle,param.getKeywords()); + Page page = courseService.page(new Page<>(param.getPage(), param.getLimit()), wrapper); + return R.ok().put("page",page); } /** * 获取未关联课程列表 */ - @RequestMapping("/getNotToMarketList") - public R getNotToMarketList(@RequestBody Map params){ - LambdaQueryWrapper wrapper = new LambdaQueryWrapper(); - wrapper.like(CourseEntity::getTitle,params.get("title")); - if (params.containsKey("marketId")&&!"".equals(params.get("marketId").toString())){ - String sql = "select course_id from course_to_market where del_flag = 0 and market_id = "+params.get("marketId"); - wrapper.notInSql(CourseEntity::getId,sql); - } - Page page = courseService.page(new Page<>( - Long.parseLong(params.get("current").toString()), Long.parseLong(params.get("limit").toString())),wrapper); - return R.ok().put("result", page); - } +// @RequestMapping("/getNotToMarketList") +// public R getNotToMarketList(@RequestBody Map params){ +// LambdaQueryWrapper wrapper = new LambdaQueryWrapper(); +// wrapper.like(CourseEntity::getTitle,params.get("title")); +// if (params.containsKey("marketId")&&!"".equals(params.get("marketId").toString())){ +// String sql = "select course_id from course_to_market where del_flag = 0 and market_id = "+params.get("marketId"); +// wrapper.notInSql(CourseEntity::getId,sql); +// } +// Page page = courseService.page(new Page<>( +// Long.parseLong(params.get("current").toString()), Long.parseLong(params.get("limit").toString())),wrapper); +// return R.ok().put("result", page); +// } - @RequestMapping(path = "/saveToMarket") - public R saveToMarket(@RequestBody Map params) { - if (!StringUtils.isEmpty(params.get("courseId").toString())){ - String[] ids = params.get("courseId").toString().split(","); - if (ids.length > 0) { - for (String id : ids) { - CourseToSociologyMarketEntity toMarket = new CourseToSociologyMarketEntity(); - toMarket.setSociologyMarketId(Integer.parseInt(params.get("marketId").toString())); - toMarket.setCourseId(Integer.parseInt(id)); - toMarketService.save(toMarket); - } - } + @RequestMapping("/bindCourseAndSociologyMarket") + public R bindCourseAndSociologyMarket(@RequestBody Map map){ + int marketId = map.get("marketId"); + int courseId = map.get("courseId"); + Integer integer = toMarketService.getBaseMapper().selectCount(new LambdaQueryWrapper().eq(CourseToSociologyMarketEntity::getSociologyMarketId, marketId).eq(CourseToSociologyMarketEntity::getCourseId, courseId)); + if(integer>0){ + return R.error("不可重复绑定"); } + CourseToSociologyMarketEntity courseToSociologyMarketEntity = new CourseToSociologyMarketEntity(); + courseToSociologyMarketEntity.setSociologyMarketId(marketId); + courseToSociologyMarketEntity.setCourseId(courseId); + toMarketService.save(courseToSociologyMarketEntity); return R.ok(); } - @RequestMapping(path = "/delToMarket") - public R delToMarket(String marketId,String courseId) { - if(StringUtils.isNotEmpty(courseId)){ - String[] productIds = courseId.split(","); - for(String id : productIds){ - LambdaQueryWrapper wrapper = new LambdaQueryWrapper(); - wrapper.eq(CourseToSociologyMarketEntity::getSociologyMarketId,marketId); - wrapper.eq(CourseToSociologyMarketEntity::getCourseId,id); - toMarketService.remove(wrapper); - } - return R.ok(); - } - return R.error("参数为空"); + @RequestMapping("/unbindCourseAndSociologyMarket") + public R unbindCourseAndSociologyMarket(@RequestBody Map map){ + int marketId = map.get("marketId"); + int courseId = map.get("courseId"); + toMarketService.getBaseMapper().delete(new LambdaQueryWrapper().eq(CourseToSociologyMarketEntity::getSociologyMarketId,marketId).eq(CourseToSociologyMarketEntity::getCourseId,courseId)); + return R.ok(); } +// @RequestMapping(path = "/saveToMarket") +// public R saveToMarket(@RequestBody Map params) { +// if (!StringUtils.isEmpty(params.get("courseId").toString())){ +// String[] ids = params.get("courseId").toString().split(","); +// if (ids.length > 0) { +// for (String id : ids) { +// CourseToSociologyMarketEntity toMarket = new CourseToSociologyMarketEntity(); +// toMarket.setSociologyMarketId(Integer.parseInt(params.get("marketId").toString())); +// toMarket.setCourseId(Integer.parseInt(id)); +// toMarketService.save(toMarket); +// } +// } +// } +// return R.ok(); +// } +// +// @RequestMapping(path = "/delToMarket") +// public R delToMarket(String marketId,String courseId) { +// if(StringUtils.isNotEmpty(courseId)){ +// String[] productIds = courseId.split(","); +// for(String id : productIds){ +// LambdaQueryWrapper wrapper = new LambdaQueryWrapper(); +// wrapper.eq(CourseToSociologyMarketEntity::getSociologyMarketId,marketId); +// wrapper.eq(CourseToSociologyMarketEntity::getCourseId,id); +// toMarketService.remove(wrapper); +// } +// return R.ok(); +// } +// return R.error("参数为空"); +// } + } diff --git a/src/main/java/com/peanut/modules/master/service/CourseToSociologyMarketService.java b/src/main/java/com/peanut/modules/master/service/CourseToSociologyMarketService.java index 85cb048d..df5cb93f 100644 --- a/src/main/java/com/peanut/modules/master/service/CourseToSociologyMarketService.java +++ b/src/main/java/com/peanut/modules/master/service/CourseToSociologyMarketService.java @@ -1,8 +1,13 @@ 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 com.peanut.modules.common.entity.CourseToSociologyMarketEntity; +import java.util.List; + public interface CourseToSociologyMarketService extends IService { + + List getCourseListByMarketId(int marketId); } diff --git a/src/main/java/com/peanut/modules/master/service/impl/CourseToSociologyMarketServiceImpl.java b/src/main/java/com/peanut/modules/master/service/impl/CourseToSociologyMarketServiceImpl.java index 95411c5b..1d1628ea 100644 --- a/src/main/java/com/peanut/modules/master/service/impl/CourseToSociologyMarketServiceImpl.java +++ b/src/main/java/com/peanut/modules/master/service/impl/CourseToSociologyMarketServiceImpl.java @@ -1,8 +1,10 @@ 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.dao.CourseToSociologyMarketDao; +import com.peanut.modules.common.entity.CourseEntity; import com.peanut.modules.common.entity.CourseToMedicineMarketEntity; import com.peanut.modules.common.entity.CourseToSociologyMarketEntity; import com.peanut.modules.master.service.CourseToMedicineMarketService; @@ -10,7 +12,19 @@ import com.peanut.modules.master.service.CourseToSociologyMarketService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import java.util.List; + @Slf4j @Service("masterCourseToSociologyMarketService") public class CourseToSociologyMarketServiceImpl extends ServiceImpl implements CourseToSociologyMarketService { + + @Override + public List getCourseListByMarketId(int marketId) { + MPJLambdaWrapper wrapper = new MPJLambdaWrapper<>(); + wrapper.selectAll(CourseEntity.class); + wrapper.leftJoin(CourseEntity.class,CourseEntity::getId,CourseToSociologyMarketEntity::getCourseId); + wrapper.eq(CourseToSociologyMarketEntity::getSociologyMarketId,marketId); + List courseEntities = this.getBaseMapper().selectJoinList(CourseEntity.class, wrapper); + return courseEntities; + } } From 009f0ea12c40484991be261c510059a014f97868 Mon Sep 17 00:00:00 2001 From: wangjinlei <751475802@qq.com> Date: Tue, 21 May 2024 10:34:39 +0800 Subject: [PATCH 02/13] bug --- .../controller/BookLabelAndMarketController.java | 13 +++++++++++++ .../controller/CourseSociologyMarketController.java | 6 +++--- .../SociologyLabelAndMarketController.java | 8 ++++++++ 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/peanut/modules/book/controller/BookLabelAndMarketController.java b/src/main/java/com/peanut/modules/book/controller/BookLabelAndMarketController.java index b48b5b19..d40df76a 100644 --- a/src/main/java/com/peanut/modules/book/controller/BookLabelAndMarketController.java +++ b/src/main/java/com/peanut/modules/book/controller/BookLabelAndMarketController.java @@ -79,6 +79,19 @@ public class BookLabelAndMarketController { return R.ok().put("result", marketTopList); } + /** + * 编辑商品和营销标签的排序权重 + * @param map + * @return + */ + @RequestMapping("/editMarketSort") + public R editMarketSort(@RequestBody Map map){ + ShopProductToBookMarket toMarket = toMarketService.getById(map.get("id")); + toMarket.setSort(map.get("sort")); + toMarketService.updateById(toMarket); + return R.ok().put("result",toMarket); + } + @RequestMapping(path = "/getLabelById") public R getLabelById(String id) { return R.ok().put("result",labelService.getById(id)); diff --git a/src/main/java/com/peanut/modules/master/controller/CourseSociologyMarketController.java b/src/main/java/com/peanut/modules/master/controller/CourseSociologyMarketController.java index 3a45b167..f5620c9a 100644 --- a/src/main/java/com/peanut/modules/master/controller/CourseSociologyMarketController.java +++ b/src/main/java/com/peanut/modules/master/controller/CourseSociologyMarketController.java @@ -49,7 +49,7 @@ public class CourseSociologyMarketController { @RequestMapping("/addSociologyMarket") public R addSociologyMarket(@RequestBody CourseSociologyMarketEntity courseSociologyMarketEntity){ marketService.save(courseSociologyMarketEntity); - return R.ok(); + return R.ok().put("market",courseSociologyMarketEntity); } @RequestMapping("/editSociologyMarket") @@ -68,8 +68,8 @@ public class CourseSociologyMarketController { return R.error("请先清空绑定的课程后，再操作"); } } - marketService.save(courseSociologyMarketEntity); - return R.ok(); + marketService.updateById(courseSociologyMarketEntity); + return R.ok().put("market",courseSociologyMarketEntity); } @RequestMapping(path = "/delMarket") diff --git a/src/main/java/com/peanut/modules/master/controller/SociologyLabelAndMarketController.java b/src/main/java/com/peanut/modules/master/controller/SociologyLabelAndMarketController.java index a5f89d59..db568bb8 100644 --- a/src/main/java/com/peanut/modules/master/controller/SociologyLabelAndMarketController.java +++ b/src/main/java/com/peanut/modules/master/controller/SociologyLabelAndMarketController.java @@ -226,6 +226,14 @@ public class SociologyLabelAndMarketController { return R.ok().put("result", page); } + @RequestMapping("/editMarketSort") + public R editMarketSort(@RequestBody Map map){ + ShopProductToSociologyMarket toMarket = toMarketService.getById(map.get("id")); + toMarket.setSort(map.get("sort")); + toMarketService.updateById(toMarket); + return R.ok().put("market",toMarket); + } + /** * 获取书标签列表 */ From ec6a16eb9caed7433706dfce1ecd08bd2254b887 Mon Sep 17 00:00:00 2001 From: wangjinlei <751475802@qq.com> Date: Tue, 21 May 2024 11:03:57 +0800 Subject: [PATCH 03/13] bug --- .../common/entity/CourseToMedicineMarketEntity.java | 2 ++ .../controller/CourseMedicineMarketController.java | 12 ++++++++++++ 2 files changed, 14 insertions(+) diff --git a/src/main/java/com/peanut/modules/common/entity/CourseToMedicineMarketEntity.java b/src/main/java/com/peanut/modules/common/entity/CourseToMedicineMarketEntity.java index 6ac03ab7..aa1ee6d6 100644 --- a/src/main/java/com/peanut/modules/common/entity/CourseToMedicineMarketEntity.java +++ b/src/main/java/com/peanut/modules/common/entity/CourseToMedicineMarketEntity.java @@ -18,6 +18,8 @@ public class CourseToMedicineMarketEntity { private Integer medicineMarketId; + private Integer sort; + private Date createTime; @TableLogic 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 7bfeaeac..30fd181d 100644 --- a/src/main/java/com/peanut/modules/master/controller/CourseMedicineMarketController.java +++ b/src/main/java/com/peanut/modules/master/controller/CourseMedicineMarketController.java @@ -161,6 +161,18 @@ public class CourseMedicineMarketController { return R.ok(); } + /** + * 修改商品和营销标签下的排序权重 + * @return + */ + @RequestMapping("/editMarketSort") + public R editMarketSort(@RequestBody Map map){ + CourseToMedicineMarketEntity toMarket = toMarketService.getById(map.get("id")); + toMarket.setSort(map.get("sort")); + toMarketService.updateById(toMarket); + return R.ok().put("result",toMarket); + } + @RequestMapping(path = "/delToMarket") public R delToMarket(String marketId,String courseId) { if(StringUtils.isNotEmpty(courseId)){ From 654cf3f6fdb808feba230d221e6a6d841d5a2b4a Mon Sep 17 00:00:00 2001 From: wangjinlei <751475802@qq.com> Date: Tue, 21 May 2024 14:10:01 +0800 Subject: [PATCH 04/13] bug --- .../controller/CourseMedicineMarketController.java | 12 ------------ .../MedicineLabelAndMarketController.java | 13 +++++++++++++ 2 files changed, 13 insertions(+), 12 deletions(-) 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 30fd181d..7bfeaeac 100644 --- a/src/main/java/com/peanut/modules/master/controller/CourseMedicineMarketController.java +++ b/src/main/java/com/peanut/modules/master/controller/CourseMedicineMarketController.java @@ -161,18 +161,6 @@ public class CourseMedicineMarketController { return R.ok(); } - /** - * 修改商品和营销标签下的排序权重 - * @return - */ - @RequestMapping("/editMarketSort") - public R editMarketSort(@RequestBody Map map){ - CourseToMedicineMarketEntity toMarket = toMarketService.getById(map.get("id")); - toMarket.setSort(map.get("sort")); - toMarketService.updateById(toMarket); - return R.ok().put("result",toMarket); - } - @RequestMapping(path = "/delToMarket") public R delToMarket(String marketId,String courseId) { if(StringUtils.isNotEmpty(courseId)){ diff --git a/src/main/java/com/peanut/modules/master/controller/MedicineLabelAndMarketController.java b/src/main/java/com/peanut/modules/master/controller/MedicineLabelAndMarketController.java index 1566be33..be39f0a8 100644 --- a/src/main/java/com/peanut/modules/master/controller/MedicineLabelAndMarketController.java +++ b/src/main/java/com/peanut/modules/master/controller/MedicineLabelAndMarketController.java @@ -116,6 +116,18 @@ public class MedicineLabelAndMarketController { } } + /** + * 修改商品和营销标签下的排序权重 + * @return + */ + @RequestMapping("/editMarketSort") + public R editMarketSort(@RequestBody Map map){ + ShopProductToMedicineMarket toMarket = toMarketService.getById(map.get("id")); + toMarket.setSort(map.get("sort")); + toMarketService.updateById(toMarket); + return R.ok().put("result",toMarket); + } + @RequestMapping(path = "/delLabel") public R delLabel(String id) { ShopProductMedicineLabel label = labelService.getById(id); @@ -279,6 +291,7 @@ public class MedicineLabelAndMarketController { if (params.containsKey("medicineMarketId")&&!"".equals(params.get("medicineMarketId").toString())){ wrapper.eq(ShopProductToMedicineMarket::getMedicineMarketId,params.get("medicineMarketId").toString()); } + wrapper.orderByAsc(ShopProductToMedicineMarket::getSort); Page page = toMarketService.page(new Page<>( Long.parseLong(params.get("current").toString()), Long.parseLong(params.get("limit").toString())),wrapper); List res = page.getRecords(); From 46f3c49197833f77620735ad1d83da908c36f81b Mon Sep 17 00:00:00 2001 From: wangjinlei <751475802@qq.com> Date: Tue, 21 May 2024 14:56:30 +0800 Subject: [PATCH 05/13] bug --- .../BookLabelAndMarketController.java | 1 + .../CourseMedicineMarketController.java | 18 ++++++------- .../controller/CourseController.java | 12 ++++++++- .../sociology/service/CourseService.java | 4 ++- .../service/impl/CourseServiceImpl.java | 26 +++++++++++++++++++ 5 files changed, 50 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/peanut/modules/book/controller/BookLabelAndMarketController.java b/src/main/java/com/peanut/modules/book/controller/BookLabelAndMarketController.java index d40df76a..5bd4d76e 100644 --- a/src/main/java/com/peanut/modules/book/controller/BookLabelAndMarketController.java +++ b/src/main/java/com/peanut/modules/book/controller/BookLabelAndMarketController.java @@ -292,6 +292,7 @@ public class BookLabelAndMarketController { if (params.containsKey("bookMarketId")&&!"".equals(params.get("bookMarketId").toString())){ wrapper.eq(ShopProductToBookMarket::getBookMarketId,params.get("bookMarketId").toString()); } + wrapper.orderByAsc(ShopProductBookMarket::getSort); Page page = toMarketService.page(new Page<>( Long.parseLong(params.get("current").toString()), Long.parseLong(params.get("limit").toString())),wrapper); List res = page.getRecords(); 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 7bfeaeac..93c195d6 100644 --- a/src/main/java/com/peanut/modules/master/controller/CourseMedicineMarketController.java +++ b/src/main/java/com/peanut/modules/master/controller/CourseMedicineMarketController.java @@ -3,10 +3,12 @@ package com.peanut.modules.master.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.peanut.common.utils.ObjectUtils; import com.peanut.common.utils.R; import com.peanut.modules.common.entity.CourseEntity; import com.peanut.modules.common.entity.CourseMedicineMarketEntity; import com.peanut.modules.common.entity.CourseToMedicineMarketEntity; +import com.peanut.modules.common.entity.CourseToSociologyMarketEntity; import com.peanut.modules.master.service.CourseMedicineMarketService; import com.peanut.modules.master.service.CourseService; import com.peanut.modules.master.service.CourseToMedicineMarketService; @@ -18,6 +20,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; @Slf4j @RestController("masterCourseMedicineMarket") @@ -134,15 +137,12 @@ public class CourseMedicineMarketController { */ @RequestMapping("/getNotToMarketList") public R getNotToMarketList(@RequestBody Map params){ - LambdaQueryWrapper wrapper = new LambdaQueryWrapper(); - wrapper.like(CourseEntity::getTitle,params.get("title")); - if (params.containsKey("marketId")&&!"".equals(params.get("marketId").toString())){ - String sql = "select course_id from course_to_market where del_flag = 0 and market_id = "+params.get("marketId"); - wrapper.notInSql(CourseEntity::getId,sql); - } - Page page = courseService.page(new Page<>( - Long.parseLong(params.get("current").toString()), Long.parseLong(params.get("limit").toString())),wrapper); - return R.ok().put("result", page); + List collect1 = toMarketService.getBaseMapper().selectList(new LambdaQueryWrapper().eq(CourseToMedicineMarketEntity::getMedicineMarketId, params.get("marketId"))).stream().map(CourseToMedicineMarketEntity::getCourseId).collect(Collectors.toList()); + LambdaQueryWrapper wrapper1 = new LambdaQueryWrapper<>(); + wrapper1.notIn(collect1.size()>0,CourseEntity::getId,collect1); + wrapper1.like(StringUtils.isNotBlank(params.get("title").toString()),CourseEntity::getTitle,params.get("title").toString()); + Page page1 = courseService.page(new Page<>(Long.parseLong(params.get("current").toString()), Long.parseLong(params.get("limit").toString())), wrapper1); + return R.ok().put("page",page1); } @RequestMapping(path = "/saveToMarket") diff --git a/src/main/java/com/peanut/modules/sociology/controller/CourseController.java b/src/main/java/com/peanut/modules/sociology/controller/CourseController.java index c2e50240..ac1b48b4 100644 --- a/src/main/java/com/peanut/modules/sociology/controller/CourseController.java +++ b/src/main/java/com/peanut/modules/sociology/controller/CourseController.java @@ -63,6 +63,16 @@ public class CourseController { return R.ok().put("courseList",marketCourseList); } + /** + * 获取国学课程价格 + * @return + */ + @RequestMapping("/getCoursePrice") + public R getCoursePrice(){ + List coursePrice = courseService.getCoursePrice(); + return R.ok().put("list",coursePrice); + } + /** * 获取国学标签下的课程列表 * @param param @@ -136,7 +146,7 @@ public class CourseController { @RequestMapping("/getMyCourse") public R getMyCourse(@RequestBody Map map){ - List courses = courseService.getMyCourse(map.get("type")); + List courses = courseService.getMyCourse(map.get("type")); return R.ok().put("courses",courses); } diff --git a/src/main/java/com/peanut/modules/sociology/service/CourseService.java b/src/main/java/com/peanut/modules/sociology/service/CourseService.java index 5e39e7ec..6ba8701b 100644 --- a/src/main/java/com/peanut/modules/sociology/service/CourseService.java +++ b/src/main/java/com/peanut/modules/sociology/service/CourseService.java @@ -22,5 +22,7 @@ public interface CourseService extends IService { Map getCourseDetail(Integer id); - List getMyCourse(int type); + List getMyCourse(int type); + + List getCoursePrice(); } 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 b36f9b0f..67c1b77e 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 @@ -131,6 +131,32 @@ public class CourseServiceImpl extends ServiceImpl impl return flag; } + @Override + public List getCoursePrice() { + //获取所有国学标签 + List courseSociologyEntities = courseSociologyDao.selectList(null); + ArrayList flag = new ArrayList<>(); + for (CourseSociologyEntity c : courseSociologyEntities){ + HashMap stringObjectHashMap = new HashMap<>(); + MPJLambdaWrapper courseToSociologyEntityMPJLambdaWrapper = new MPJLambdaWrapper<>(); + courseToSociologyEntityMPJLambdaWrapper.selectAll(CourseEntity.class); + courseToSociologyEntityMPJLambdaWrapper.leftJoin(CourseEntity.class,CourseEntity::getId,CourseToSociologyEntity::getCourseId); + courseToSociologyEntityMPJLambdaWrapper.eq(CourseToSociologyEntity::getSociologyId,c.getId()); + List courseEntities = courseToSociologyDao.selectJoinList(CourseEntity.class, courseToSociologyEntityMPJLambdaWrapper); + if(courseEntities.size()==0){ + continue; + } + for (CourseEntity co:courseEntities){ + List courseCatalogueEntities = courseCatalogueDao.selectList(new LambdaQueryWrapper().eq(CourseCatalogueEntity::getCourseId, co.getId()).orderByAsc(CourseCatalogueEntity::getSort)); + co.setCourseCatalogueEntityList(courseCatalogueEntities); + } + stringObjectHashMap.put("sociology",c); + stringObjectHashMap.put("courseList",courseEntities); + flag.add(stringObjectHashMap); + } + return flag; + } + private Integer catalogueCompletion(CourseCatalogueEntity c){ List courseCatalogueChapterEntities = courseCatalogueChapterDao.selectList(new LambdaQueryWrapper().eq(CourseCatalogueChapterEntity::getCatalogueId, c.getId())); Integer act = 0; From f246c8a0a997577a9b40961f9bd20f28efba29d1 Mon Sep 17 00:00:00 2001 From: wangjinlei <751475802@qq.com> Date: Tue, 21 May 2024 16:18:03 +0800 Subject: [PATCH 06/13] bug --- .../controller/CourseMedicineMarketController.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) 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 93c195d6..ce6c13d4 100644 --- a/src/main/java/com/peanut/modules/master/controller/CourseMedicineMarketController.java +++ b/src/main/java/com/peanut/modules/master/controller/CourseMedicineMarketController.java @@ -9,6 +9,7 @@ import com.peanut.modules.common.entity.CourseEntity; import com.peanut.modules.common.entity.CourseMedicineMarketEntity; import com.peanut.modules.common.entity.CourseToMedicineMarketEntity; import com.peanut.modules.common.entity.CourseToSociologyMarketEntity; +import com.peanut.modules.common.to.ParamTo; import com.peanut.modules.master.service.CourseMedicineMarketService; import com.peanut.modules.master.service.CourseService; import com.peanut.modules.master.service.CourseToMedicineMarketService; @@ -136,12 +137,12 @@ public class CourseMedicineMarketController { * 获取未关联课程列表 */ @RequestMapping("/getNotToMarketList") - public R getNotToMarketList(@RequestBody Map params){ - List collect1 = toMarketService.getBaseMapper().selectList(new LambdaQueryWrapper().eq(CourseToMedicineMarketEntity::getMedicineMarketId, params.get("marketId"))).stream().map(CourseToMedicineMarketEntity::getCourseId).collect(Collectors.toList()); + public R getNotToMarketList(@RequestBody ParamTo param){ + List collect1 = toMarketService.getBaseMapper().selectList(new LambdaQueryWrapper().eq(CourseToMedicineMarketEntity::getMedicineMarketId, param.getId())).stream().map(CourseToMedicineMarketEntity::getCourseId).collect(Collectors.toList()); LambdaQueryWrapper wrapper1 = new LambdaQueryWrapper<>(); wrapper1.notIn(collect1.size()>0,CourseEntity::getId,collect1); - wrapper1.like(StringUtils.isNotBlank(params.get("title").toString()),CourseEntity::getTitle,params.get("title").toString()); - Page page1 = courseService.page(new Page<>(Long.parseLong(params.get("current").toString()), Long.parseLong(params.get("limit").toString())), wrapper1); + wrapper1.like(StringUtils.isNotBlank(param.getKeywords()),CourseEntity::getTitle,param.getKeywords()); + Page page1 = courseService.page(new Page<>(param.getPage(), param.getLimit()), wrapper1); return R.ok().put("page",page1); } From 8cfb645798a3b65e65033872786e8d7b5253d719 Mon Sep 17 00:00:00 2001 From: wangjinlei <751475802@qq.com> Date: Tue, 21 May 2024 16:54:36 +0800 Subject: [PATCH 07/13] bug --- .../controller/ShopProductController.java | 2 +- .../CourseMedicineMarketController.java | 26 ++++++++++++------- .../CourseToMedicineMarketService.java | 5 ++++ .../CourseToMedicineMarketServiceImpl.java | 15 +++++++++++ 4 files changed, 38 insertions(+), 10 deletions(-) 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; + } } From 58d6741d45596c24261b3760af3cb193c0d90b47 Mon Sep 17 00:00:00 2001 From: wangjinlei <751475802@qq.com> Date: Tue, 21 May 2024 16:58:17 +0800 Subject: [PATCH 08/13] bug --- .../modules/common/entity/CourseToSociologyMarketEntity.java | 2 ++ .../master/service/impl/CourseToMedicineMarketServiceImpl.java | 1 + .../master/service/impl/CourseToSociologyMarketServiceImpl.java | 1 + 3 files changed, 4 insertions(+) diff --git a/src/main/java/com/peanut/modules/common/entity/CourseToSociologyMarketEntity.java b/src/main/java/com/peanut/modules/common/entity/CourseToSociologyMarketEntity.java index e04925e3..4353327a 100644 --- a/src/main/java/com/peanut/modules/common/entity/CourseToSociologyMarketEntity.java +++ b/src/main/java/com/peanut/modules/common/entity/CourseToSociologyMarketEntity.java @@ -18,6 +18,8 @@ public class CourseToSociologyMarketEntity { private Integer sociologyMarketId; + private Integer sort; + private Date createTime; @TableLogic 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 451f11cb..cad94578 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 @@ -22,6 +22,7 @@ public class CourseToMedicineMarketServiceImpl extends ServiceImpl courseEntities = this.getBaseMapper().selectJoinList(CourseEntity.class, wrapper); return courseEntities; } diff --git a/src/main/java/com/peanut/modules/master/service/impl/CourseToSociologyMarketServiceImpl.java b/src/main/java/com/peanut/modules/master/service/impl/CourseToSociologyMarketServiceImpl.java index 1d1628ea..62105cfb 100644 --- a/src/main/java/com/peanut/modules/master/service/impl/CourseToSociologyMarketServiceImpl.java +++ b/src/main/java/com/peanut/modules/master/service/impl/CourseToSociologyMarketServiceImpl.java @@ -24,6 +24,7 @@ public class CourseToSociologyMarketServiceImpl extends ServiceImpl courseEntities = this.getBaseMapper().selectJoinList(CourseEntity.class, wrapper); return courseEntities; } From 2280276a584d82f6fe18a17b2e3adfb6c252b7f5 Mon Sep 17 00:00:00 2001 From: wangjinlei <751475802@qq.com> Date: Tue, 21 May 2024 18:05:55 +0800 Subject: [PATCH 09/13] bug --- .../CourseMedicineMarketController.java | 132 ++++++------------ .../impl/CourseMedicineServiceImpl.java | 4 +- 2 files changed, 46 insertions(+), 90 deletions(-) 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 58cc6f43..a407aab1 100644 --- a/src/main/java/com/peanut/modules/master/controller/CourseMedicineMarketController.java +++ b/src/main/java/com/peanut/modules/master/controller/CourseMedicineMarketController.java @@ -5,10 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.peanut.common.utils.ObjectUtils; import com.peanut.common.utils.R; -import com.peanut.modules.common.entity.CourseEntity; -import com.peanut.modules.common.entity.CourseMedicineMarketEntity; -import com.peanut.modules.common.entity.CourseToMedicineMarketEntity; -import com.peanut.modules.common.entity.CourseToSociologyMarketEntity; +import com.peanut.modules.common.entity.*; import com.peanut.modules.common.to.ParamTo; import com.peanut.modules.master.service.CourseMedicineMarketService; import com.peanut.modules.master.service.CourseService; @@ -44,58 +41,41 @@ public class CourseMedicineMarketController { return R.ok().put("result", marketsTree); } - /** - * 获取营销标签列表 - */ - @RequestMapping(path = "/getMakertListByPid") - public R getMakertListByPid(String pid) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper(); - wrapper.eq(CourseMedicineMarketEntity::getPid,pid); - wrapper.orderByAsc(CourseMedicineMarketEntity::getSort); - wrapper.orderByAsc(CourseMedicineMarketEntity::getCreateTime); - List marketTopList = marketService.list(wrapper); - return R.ok().put("result", marketTopList); - } - @RequestMapping(path = "/getMarketById") - public R getMarketById(String id) { + public R getMarketById(@RequestBody Map map) { + int id = map.get("id"); return R.ok().put("result",marketService.getById(id)); } - @RequestMapping(path = "/saveOrUpdateMarket") - public R saveOrUpdateMarket(@RequestBody CourseMedicineMarketEntity market) { - if (market.getId()==null){ - if(market.getPid()==0){ - marketService.save(market); - return R.ok().put("result",market); - }else { - CourseMedicineMarketEntity m = marketService.getById(market.getPid()); - if (m.getIsLast()==1){ - return R.error("请将父标签设置为非最后一集"); - }else { - marketService.save(market); - return R.ok().put("result",market); - } - } - }else { - if (market.getIsLast() == 1){ - List mList = marketService.list(new LambdaQueryWrapper() - .eq(CourseMedicineMarketEntity::getPid,market.getId())); - if (mList.size()>0){ - return R.error("请先删除子集，再设置为最后一集"); - }else { - marketService.saveOrUpdate(market); - return R.ok().put("result",market); - } - }else { - marketService.saveOrUpdate(market); - return R.ok().put("result",market); + @RequestMapping("/addSociologyMarket") + public R addSociologyMarket(@RequestBody CourseMedicineMarketEntity courseMedicineMarketEntity){ + marketService.save(courseMedicineMarketEntity); + return R.ok().put("market",courseMedicineMarketEntity); + } + + @RequestMapping("/editSociologyMarket") + public R editSociologyMarket(@RequestBody CourseMedicineMarketEntity courseMedicineMarketEntity){ + CourseMedicineMarketEntity old = marketService.getById(courseMedicineMarketEntity.getId()); + if(courseMedicineMarketEntity.getIsLast()==1&&old.getIsLast()==0){//非终节点到终结点，要排除是否存在子集 + Integer integer = marketService.getBaseMapper().selectCount(new LambdaQueryWrapper().eq(CourseMedicineMarketEntity::getPid, courseMedicineMarketEntity.getId())); + if(integer>0){ + return R.error("请先清空子集再操作！"); } } + + if(courseMedicineMarketEntity.getIsLast()==0&&old.getIsLast()==1){ + Integer integer = toMarketService.getBaseMapper().selectCount(new LambdaQueryWrapper().eq(CourseToMedicineMarketEntity::getMedicineMarketId, courseMedicineMarketEntity.getId())); + if(integer>0){ + return R.error("请先清空绑定的课程后，再操作"); + } + } + marketService.updateById(courseMedicineMarketEntity); + return R.ok().put("market",courseMedicineMarketEntity); } @RequestMapping(path = "/delMarket") - public R delMarket(String id) { + public R delMarket(@RequestBody Map map) { + int id = map.get("id"); CourseMedicineMarketEntity market = marketService.getById(id); if (market.getIsLast()==1){ MPJLambdaWrapper wrapper = new MPJLambdaWrapper(); @@ -118,22 +98,6 @@ 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 getCourseByMarketId(@RequestBody Map map){ int marketId = map.get("marketId"); @@ -154,35 +118,27 @@ public class CourseMedicineMarketController { return R.ok().put("page",page1); } - @RequestMapping(path = "/saveToMarket") - public R saveToMarket(@RequestBody Map params) { - if (!StringUtils.isEmpty(params.get("courseId").toString())){ - String[] ids = params.get("courseId").toString().split(","); - if (ids.length > 0) { - for (String id : ids) { - CourseToMedicineMarketEntity toMarket = new CourseToMedicineMarketEntity(); - toMarket.setMedicineMarketId(Integer.parseInt(params.get("marketId").toString())); - toMarket.setCourseId(Integer.parseInt(id)); - toMarketService.save(toMarket); - } - } + @RequestMapping("/bindCourseAndMedicineMarket") + public R bindCourseAndMedicineMarket(@RequestBody Map map){ + int marketId = map.get("marketId"); + int courseId = map.get("courseId"); + Integer integer = toMarketService.getBaseMapper().selectCount(new LambdaQueryWrapper().eq(CourseToMedicineMarketEntity::getMedicineMarketId, marketId).eq(CourseToMedicineMarketEntity::getCourseId, courseId)); + if(integer>0){ + return R.error("不可重复绑定"); } + CourseToMedicineMarketEntity courseToMedicineMarketEntity = new CourseToMedicineMarketEntity(); + courseToMedicineMarketEntity.setMedicineMarketId(marketId); + courseToMedicineMarketEntity.setCourseId(courseId); + toMarketService.save(courseToMedicineMarketEntity); return R.ok(); } - @RequestMapping(path = "/delToMarket") - public R delToMarket(String marketId,String courseId) { - if(StringUtils.isNotEmpty(courseId)){ - String[] productIds = courseId.split(","); - for(String id : productIds){ - LambdaQueryWrapper wrapper = new LambdaQueryWrapper(); - wrapper.eq(CourseToMedicineMarketEntity::getMedicineMarketId,marketId); - wrapper.eq(CourseToMedicineMarketEntity::getCourseId,id); - toMarketService.remove(wrapper); - } - return R.ok(); - } - return R.error("参数为空"); + @RequestMapping("/unbindCourseAndMedicineMarket") + public R unbindCourseAndMedicineMarket(@RequestBody Map map){ + int marketId = map.get("marketId"); + int courseId = map.get("courseId"); + toMarketService.getBaseMapper().delete(new LambdaQueryWrapper().eq(CourseToMedicineMarketEntity::getMedicineMarketId,marketId).eq(CourseToMedicineMarketEntity::getCourseId,courseId)); + return R.ok(); } } diff --git a/src/main/java/com/peanut/modules/master/service/impl/CourseMedicineServiceImpl.java b/src/main/java/com/peanut/modules/master/service/impl/CourseMedicineServiceImpl.java index 37344744..254fa068 100644 --- a/src/main/java/com/peanut/modules/master/service/impl/CourseMedicineServiceImpl.java +++ b/src/main/java/com/peanut/modules/master/service/impl/CourseMedicineServiceImpl.java @@ -52,8 +52,8 @@ public class CourseMedicineServiceImpl extends ServiceImpl().eq(CourseToMedicine::getMedicalId, courseMedicine.getId())); - if(courseToSociologyEntity!=null){ + Integer integer = toMedicalDao.selectCount(new LambdaQueryWrapper().eq(CourseToMedicine::getMedicalId, courseMedicine.getId())); + if(integer>0){ return R.error(502,"更新失败，请先把此项与课程的关联关系清空后才可把此标签变成普通标签"); } } From 689d2413100bbf7b959809bb6dfec5d95d75f6ce Mon Sep 17 00:00:00 2001 From: wangjinlei <751475802@qq.com> Date: Wed, 22 May 2024 14:10:28 +0800 Subject: [PATCH 10/13] bug --- .../controller/BookLabelAndMarketController.java | 3 ++- .../modules/book/controller/BuyOrderController.java | 8 ++++++-- .../controller/CourseMedicineMarketController.java | 12 ++++++++++-- .../controller/CourseSociologyMarketController.java | 10 ++++++++++ .../sociology/controller/CourseController.java | 2 +- .../sociology/service/impl/CourseServiceImpl.java | 4 ++-- 6 files changed, 31 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/peanut/modules/book/controller/BookLabelAndMarketController.java b/src/main/java/com/peanut/modules/book/controller/BookLabelAndMarketController.java index 5bd4d76e..9259ed9f 100644 --- a/src/main/java/com/peanut/modules/book/controller/BookLabelAndMarketController.java +++ b/src/main/java/com/peanut/modules/book/controller/BookLabelAndMarketController.java @@ -375,7 +375,8 @@ public class BookLabelAndMarketController { wrapper.eq(ShopProductToBookLabel::getBookLabelId,labelId); wrapper.leftJoin(ShopProduct.class,ShopProduct::getProductId,ShopProductToBookLabel::getProductId); wrapper.selectAll(ShopProduct.class); - wrapper.orderByAsc(ShopProductToBookLabel::getSort); +// wrapper.orderByAsc(ShopProductToBookLabel::getSort); + wrapper.orderByDesc(ShopProduct::getSumSales); List list = toLabelService.listMaps(wrapper); return R.ok().put("result", list); } diff --git a/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java b/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java index 5e3fb3fc..8179a363 100644 --- a/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java +++ b/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java @@ -247,7 +247,8 @@ public class BuyOrderController { totalPrice = totalPrice.add(getShoppingAmount(buyOrder)); //减去积分抵扣 - totalPrice = totalPrice.subtract(buyOrder.getJfDeduction()); + + totalPrice = totalPrice.subtract(buyOrder.getJfDeduction()==null?BigDecimal.ZERO:buyOrder.getJfDeduction()); String orderSn = IdWorker.getTimeId().substring(0, 32); buyOrder.setOrderSn(orderSn); @@ -293,7 +294,7 @@ public class BuyOrderController { recordTransaction(buyOrder, user, totalPrice); } //记录用户积分消费情况 - if(buyOrder.getJfDeduction().compareTo(BigDecimal.ZERO) > 0){ + if(buyOrder.getJfDeduction()!=null&&buyOrder.getJfDeduction().compareTo(BigDecimal.ZERO) > 0){ recordJfTransaction(buyOrder, user, buyOrder.getJfDeduction()); } //消费用户积分并记录用户积分消费记录 @@ -874,6 +875,9 @@ public class BuyOrderController { private boolean useJfCoin(MyUserEntity user,BigDecimal jf){ + if(jf==null){ + return true; + } if(user.getJf().compareTo(jf)>=0){ user.setJf(user.getJf().subtract(jf)); this.myUserService.updateById(user); 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 a407aab1..6f87d88f 100644 --- a/src/main/java/com/peanut/modules/master/controller/CourseMedicineMarketController.java +++ b/src/main/java/com/peanut/modules/master/controller/CourseMedicineMarketController.java @@ -50,7 +50,7 @@ public class CourseMedicineMarketController { @RequestMapping("/addSociologyMarket") public R addSociologyMarket(@RequestBody CourseMedicineMarketEntity courseMedicineMarketEntity){ marketService.save(courseMedicineMarketEntity); - return R.ok().put("market",courseMedicineMarketEntity); + return R.ok().put("result",courseMedicineMarketEntity); } @RequestMapping("/editSociologyMarket") @@ -70,7 +70,7 @@ public class CourseMedicineMarketController { } } marketService.updateById(courseMedicineMarketEntity); - return R.ok().put("market",courseMedicineMarketEntity); + return R.ok().put("result",courseMedicineMarketEntity); } @RequestMapping(path = "/delMarket") @@ -105,6 +105,14 @@ public class CourseMedicineMarketController { return R.ok().put("list",courseByMarketId); } + @RequestMapping("/editMarketSort") + public R editMarketSort(@RequestBody Map map){ + CourseToMedicineMarketEntity info = toMarketService.getOne(new LambdaQueryWrapper().eq(CourseToMedicineMarketEntity::getCourseId, map.get("courseId")).eq(CourseToMedicineMarketEntity::getMedicineMarketId, map.get("marketId")),false); + info.setSort(map.get("sort")); + toMarketService.updateById(info); + return R.ok().put("result",info); + } + /** * 获取未关联课程列表 */ diff --git a/src/main/java/com/peanut/modules/master/controller/CourseSociologyMarketController.java b/src/main/java/com/peanut/modules/master/controller/CourseSociologyMarketController.java index f5620c9a..7f1ecc21 100644 --- a/src/main/java/com/peanut/modules/master/controller/CourseSociologyMarketController.java +++ b/src/main/java/com/peanut/modules/master/controller/CourseSociologyMarketController.java @@ -97,6 +97,16 @@ public class CourseSociologyMarketController { } } + @RequestMapping("/editMarketSort") + public R editMarketSort(@RequestBody Map map){ + CourseToSociologyMarketEntity info = toMarketService.getOne(new LambdaQueryWrapper() + .eq(CourseToSociologyMarketEntity::getSociologyMarketId, map.get("marketId")) + .eq(CourseToSociologyMarketEntity::getCourseId, map.get("courseId")), false); + info.setSort(map.get("sort")); + toMarketService.updateById(info); + return R.ok().put("result",info); + } + @RequestMapping("/getCourseListByMarketId") public R getCourseListByMarketId(@RequestBody Map map){ List marketId = toMarketService.getCourseListByMarketId(map.get("marketId")); diff --git a/src/main/java/com/peanut/modules/sociology/controller/CourseController.java b/src/main/java/com/peanut/modules/sociology/controller/CourseController.java index ac1b48b4..ec3086cf 100644 --- a/src/main/java/com/peanut/modules/sociology/controller/CourseController.java +++ b/src/main/java/com/peanut/modules/sociology/controller/CourseController.java @@ -53,7 +53,7 @@ public class CourseController { } /** - * 获取营销标签下的课程列表 + * 获取国学营销标签下的课程列表 * @param param * @return */ 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 67c1b77e..b260b1d6 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 @@ -77,8 +77,8 @@ public class CourseServiceImpl extends ServiceImpl impl public Page getMarketCourseList(ParamTo param) { MPJLambdaWrapper wrapper = new MPJLambdaWrapper<>(); wrapper.selectAll(CourseEntity.class); - wrapper.leftJoin(CourseToMedicineMarketEntity.class, CourseToMedicineMarketEntity::getCourseId,CourseEntity::getId); - wrapper.eq(CourseToMedicineMarketEntity::getMedicineMarketId,param.getId()); + wrapper.leftJoin(CourseToSociologyMarketEntity.class, CourseToSociologyMarketEntity::getCourseId,CourseEntity::getId); + wrapper.eq(CourseToSociologyMarketEntity::getSociologyMarketId,param.getId()); wrapper.orderByAsc(CourseToSociologyEntity::getSort); Page courseEntityPage = this.getBaseMapper().selectJoinPage(new Page<>(param.getPage(), param.getLimit()), CourseEntity.class, wrapper); return courseEntityPage; From 01570f298524d9647b9108293dfe8f464d31fc34 Mon Sep 17 00:00:00 2001 From: wangjinlei <751475802@qq.com> Date: Wed, 22 May 2024 14:33:07 +0800 Subject: [PATCH 11/13] bug --- .../entity/CourseToMedicineMarketEntity.java | 8 ++++++ .../entity/CourseToSociologyMarketEntity.java | 8 ++++++ .../CourseMedicineMarketController.java | 2 +- .../CourseSociologyMarketController.java | 4 +-- .../CourseToMedicineMarketService.java | 2 +- .../CourseToSociologyMarketService.java | 2 +- .../CourseToMedicineMarketServiceImpl.java | 26 ++++++++++++------- .../CourseToSociologyMarketServiceImpl.java | 25 ++++++++++++------ 8 files changed, 55 insertions(+), 22 deletions(-) diff --git a/src/main/java/com/peanut/modules/common/entity/CourseToMedicineMarketEntity.java b/src/main/java/com/peanut/modules/common/entity/CourseToMedicineMarketEntity.java index aa1ee6d6..d0a1a24b 100644 --- a/src/main/java/com/peanut/modules/common/entity/CourseToMedicineMarketEntity.java +++ b/src/main/java/com/peanut/modules/common/entity/CourseToMedicineMarketEntity.java @@ -1,5 +1,6 @@ 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; @@ -24,4 +25,11 @@ public class CourseToMedicineMarketEntity { @TableLogic private Integer delFlag; + + @TableField(exist = false) + private CourseMedicineMarketEntity courseMedicineMarketEntity; + + @TableField(exist = false) + private CourseEntity courseEntity; + } diff --git a/src/main/java/com/peanut/modules/common/entity/CourseToSociologyMarketEntity.java b/src/main/java/com/peanut/modules/common/entity/CourseToSociologyMarketEntity.java index 4353327a..6d825f14 100644 --- a/src/main/java/com/peanut/modules/common/entity/CourseToSociologyMarketEntity.java +++ b/src/main/java/com/peanut/modules/common/entity/CourseToSociologyMarketEntity.java @@ -1,5 +1,6 @@ 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; @@ -24,4 +25,11 @@ public class CourseToSociologyMarketEntity { @TableLogic private Integer delFlag; + + @TableField(exist = false) + private CourseSociologyMarketEntity courseSociologyMarketEntity; + + @TableField(exist = false) + private CourseEntity courseEntity; + } 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 6f87d88f..1bc06710 100644 --- a/src/main/java/com/peanut/modules/master/controller/CourseMedicineMarketController.java +++ b/src/main/java/com/peanut/modules/master/controller/CourseMedicineMarketController.java @@ -101,7 +101,7 @@ public class CourseMedicineMarketController { @RequestMapping(path = "/getCourseByMarketId") public R getCourseByMarketId(@RequestBody Map map){ int marketId = map.get("marketId"); - List courseByMarketId = toMarketService.getCourseByMarketId(marketId); + List courseByMarketId = toMarketService.getCourseByMarketId(marketId); return R.ok().put("list",courseByMarketId); } diff --git a/src/main/java/com/peanut/modules/master/controller/CourseSociologyMarketController.java b/src/main/java/com/peanut/modules/master/controller/CourseSociologyMarketController.java index 7f1ecc21..4c159367 100644 --- a/src/main/java/com/peanut/modules/master/controller/CourseSociologyMarketController.java +++ b/src/main/java/com/peanut/modules/master/controller/CourseSociologyMarketController.java @@ -109,8 +109,8 @@ public class CourseSociologyMarketController { @RequestMapping("/getCourseListByMarketId") public R getCourseListByMarketId(@RequestBody Map map){ - List marketId = toMarketService.getCourseListByMarketId(map.get("marketId")); - return R.ok().put("courseList",marketId); + List marketId = toMarketService.getCourseListByMarketId(map.get("marketId")); + return R.ok().put("list",marketId); } /** 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 cb8e0463..e0f3a3c0 100644 --- a/src/main/java/com/peanut/modules/master/service/CourseToMedicineMarketService.java +++ b/src/main/java/com/peanut/modules/master/service/CourseToMedicineMarketService.java @@ -8,5 +8,5 @@ import java.util.List; public interface CourseToMedicineMarketService extends IService { - List getCourseByMarketId(int marketId); + List getCourseByMarketId(int marketId); } diff --git a/src/main/java/com/peanut/modules/master/service/CourseToSociologyMarketService.java b/src/main/java/com/peanut/modules/master/service/CourseToSociologyMarketService.java index df5cb93f..a78674d0 100644 --- a/src/main/java/com/peanut/modules/master/service/CourseToSociologyMarketService.java +++ b/src/main/java/com/peanut/modules/master/service/CourseToSociologyMarketService.java @@ -9,5 +9,5 @@ import java.util.List; public interface CourseToSociologyMarketService extends IService { - List getCourseListByMarketId(int marketId); + List getCourseListByMarketId(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 cad94578..1ed79c4a 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,12 +1,16 @@ package com.peanut.modules.master.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.peanut.modules.common.dao.CourseDao; +import com.peanut.modules.common.dao.CourseMedicineMarketDao; 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.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -14,16 +18,20 @@ import java.util.List; @Slf4j @Service("masterCourseToMarketService") public class CourseToMedicineMarketServiceImpl extends ServiceImpl implements CourseToMedicineMarketService { - + @Autowired + private CourseMedicineMarketDao courseMedicineMarketDao; + @Autowired + private CourseDao courseDao; @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); - wrapper.orderByAsc(CourseToMedicineMarketEntity::getSort); - List courseEntities = this.getBaseMapper().selectJoinList(CourseEntity.class, wrapper); - return courseEntities; + public List getCourseByMarketId(int marketId) { + List courseToMedicineMarketEntities = this.getBaseMapper().selectList(new LambdaQueryWrapper() + .eq(CourseToMedicineMarketEntity::getMedicineMarketId, marketId) + .orderByAsc(CourseToMedicineMarketEntity::getSort)); + for (CourseToMedicineMarketEntity c :courseToMedicineMarketEntities){ + c.setCourseMedicineMarketEntity(courseMedicineMarketDao.selectById(c.getMedicineMarketId())); + c.setCourseEntity(courseDao.selectById(c.getCourseId())); + } + return courseToMedicineMarketEntities; } } diff --git a/src/main/java/com/peanut/modules/master/service/impl/CourseToSociologyMarketServiceImpl.java b/src/main/java/com/peanut/modules/master/service/impl/CourseToSociologyMarketServiceImpl.java index 62105cfb..61ffadb4 100644 --- a/src/main/java/com/peanut/modules/master/service/impl/CourseToSociologyMarketServiceImpl.java +++ b/src/main/java/com/peanut/modules/master/service/impl/CourseToSociologyMarketServiceImpl.java @@ -1,7 +1,10 @@ package com.peanut.modules.master.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.peanut.modules.common.dao.CourseDao; +import com.peanut.modules.common.dao.CourseSociologyMarketDao; import com.peanut.modules.common.dao.CourseToMedicineMarketDao; import com.peanut.modules.common.dao.CourseToSociologyMarketDao; import com.peanut.modules.common.entity.CourseEntity; @@ -10,6 +13,7 @@ import com.peanut.modules.common.entity.CourseToSociologyMarketEntity; import com.peanut.modules.master.service.CourseToMedicineMarketService; import com.peanut.modules.master.service.CourseToSociologyMarketService; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -17,15 +21,20 @@ import java.util.List; @Slf4j @Service("masterCourseToSociologyMarketService") public class CourseToSociologyMarketServiceImpl extends ServiceImpl implements CourseToSociologyMarketService { + @Autowired + private CourseSociologyMarketDao courseSociologyMarketDao; + @Autowired + private CourseDao courseDao; @Override - public List getCourseListByMarketId(int marketId) { - MPJLambdaWrapper wrapper = new MPJLambdaWrapper<>(); - wrapper.selectAll(CourseEntity.class); - wrapper.leftJoin(CourseEntity.class,CourseEntity::getId,CourseToSociologyMarketEntity::getCourseId); - wrapper.eq(CourseToSociologyMarketEntity::getSociologyMarketId,marketId); - wrapper.orderByAsc(CourseToSociologyMarketEntity::getSort); - List courseEntities = this.getBaseMapper().selectJoinList(CourseEntity.class, wrapper); - return courseEntities; + public List getCourseListByMarketId(int marketId) { + List courseToSociologyMarketEntities = this.getBaseMapper().selectList(new LambdaQueryWrapper() + .eq(CourseToSociologyMarketEntity::getSociologyMarketId, marketId) + .orderByAsc(CourseToSociologyMarketEntity::getSort)); + for (CourseToSociologyMarketEntity c : courseToSociologyMarketEntities){ + c.setCourseSociologyMarketEntity(courseSociologyMarketDao.selectById(c.getSociologyMarketId())); + c.setCourseEntity(courseDao.selectById(c.getCourseId())); + } + return courseToSociologyMarketEntities; } } From b48cc2772374867fb3e4ce47ad03068827df7659 Mon Sep 17 00:00:00 2001 From: wangjinlei <751475802@qq.com> Date: Thu, 23 May 2024 14:41:38 +0800 Subject: [PATCH 12/13] bug --- .../common/dao/SysCourseDirectDao.java | 9 +++++ .../common/entity/SysCourseDirectEntity.java | 28 +++++++++++++++ .../common/to/EditCourseRecordDto.java | 10 ++++++ .../master/controller/CourseController.java | 34 +++++++++++++----- .../service/SysCourseDirectService.java | 10 ++++++ .../impl/SysCourseDirectServiceImpl.java | 36 +++++++++++++++++++ .../controller/CourseController.java | 14 ++++++++ 7 files changed, 133 insertions(+), 8 deletions(-) create mode 100644 src/main/java/com/peanut/modules/common/dao/SysCourseDirectDao.java create mode 100644 src/main/java/com/peanut/modules/common/entity/SysCourseDirectEntity.java create mode 100644 src/main/java/com/peanut/modules/common/to/EditCourseRecordDto.java create mode 100644 src/main/java/com/peanut/modules/master/service/SysCourseDirectService.java create mode 100644 src/main/java/com/peanut/modules/master/service/impl/SysCourseDirectServiceImpl.java diff --git a/src/main/java/com/peanut/modules/common/dao/SysCourseDirectDao.java b/src/main/java/com/peanut/modules/common/dao/SysCourseDirectDao.java new file mode 100644 index 00000000..0576d47a --- /dev/null +++ b/src/main/java/com/peanut/modules/common/dao/SysCourseDirectDao.java @@ -0,0 +1,9 @@ +package com.peanut.modules.common.dao; + +import com.github.yulichang.base.MPJBaseMapper; +import com.peanut.modules.common.entity.SysCourseDirectEntity; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface SysCourseDirectDao extends MPJBaseMapper { +} diff --git a/src/main/java/com/peanut/modules/common/entity/SysCourseDirectEntity.java b/src/main/java/com/peanut/modules/common/entity/SysCourseDirectEntity.java new file mode 100644 index 00000000..cfc8ab82 --- /dev/null +++ b/src/main/java/com/peanut/modules/common/entity/SysCourseDirectEntity.java @@ -0,0 +1,28 @@ +package com.peanut.modules.common.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +@Data +@TableName("sys_course_direct") +public class SysCourseDirectEntity { + + @TableId + private Integer id; + + private Integer type; + + private String buyRecord; + + private String useRecord; + + private String studyRecord; + + private String vipRecord; + + @TableLogic + private Integer delFlag; + +} diff --git a/src/main/java/com/peanut/modules/common/to/EditCourseRecordDto.java b/src/main/java/com/peanut/modules/common/to/EditCourseRecordDto.java new file mode 100644 index 00000000..4cebcf78 --- /dev/null +++ b/src/main/java/com/peanut/modules/common/to/EditCourseRecordDto.java @@ -0,0 +1,10 @@ +package com.peanut.modules.common.to; + +import lombok.Data; + +@Data +public class EditCourseRecordDto { + private Integer type; + private Integer recordType; + private String content; +} 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 58c774fa..3ca2f228 100644 --- a/src/main/java/com/peanut/modules/master/controller/CourseController.java +++ b/src/main/java/com/peanut/modules/master/controller/CourseController.java @@ -1,17 +1,13 @@ package com.peanut.modules.master.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.peanut.common.utils.R; import com.peanut.modules.common.dao.CourseCatalogueChapterVideoDao; -import com.peanut.modules.common.entity.CourseCatalogueChapterEntity; -import com.peanut.modules.common.entity.CourseCatalogueChapterVideoEntity; -import com.peanut.modules.common.entity.CourseCatalogueEntity; -import com.peanut.modules.common.entity.CourseEntity; +import com.peanut.modules.common.entity.*; +import com.peanut.modules.common.to.EditCourseRecordDto; import com.peanut.modules.common.to.ParamTo; -import com.peanut.modules.master.service.CourseCatalogueChapterService; -import com.peanut.modules.master.service.CourseCatalogueChapterVideoService; -import com.peanut.modules.master.service.CourseCatalogueService; -import com.peanut.modules.master.service.CourseService; +import com.peanut.modules.master.service.*; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; @@ -34,6 +30,8 @@ public class CourseController { private CourseCatalogueChapterService courseCatalogueChapterService; @Autowired private CourseCatalogueChapterVideoService courseCatalogueChapterVideoService; + @Autowired + private SysCourseDirectService sysCourseDirectService; @RequestMapping("/getCourseList") @@ -129,6 +127,26 @@ public class CourseController { return R.ok(); } + /** + * 获取课程说明 + * @param map + * @return + */ + @RequestMapping("/getCourseRecord") + public R getCourseRecord(@RequestBody Map map){ + SysCourseDirectEntity info = sysCourseDirectService.getOne(new LambdaQueryWrapper().eq(SysCourseDirectEntity::getType, map.get("type"))); + return R.ok().put("result",info); + } + + @RequestMapping("/editCourseRecord") + public R editCourseRecord(@RequestBody EditCourseRecordDto editCourseRecordDto){ + SysCourseDirectEntity sysCourseDirectEntity = sysCourseDirectService.editCourseRecord(editCourseRecordDto); + return R.ok().put("result",sysCourseDirectEntity); + } + + + + @RequestMapping("/editCourseCatalogueChapterVideo") public R editCourseCatalogueChapterVideo(@RequestBody CourseCatalogueChapterVideoEntity courseCatalogueChapterVideoEntity){ courseCatalogueChapterVideoService.updateById(courseCatalogueChapterVideoEntity); diff --git a/src/main/java/com/peanut/modules/master/service/SysCourseDirectService.java b/src/main/java/com/peanut/modules/master/service/SysCourseDirectService.java new file mode 100644 index 00000000..01ea3696 --- /dev/null +++ b/src/main/java/com/peanut/modules/master/service/SysCourseDirectService.java @@ -0,0 +1,10 @@ +package com.peanut.modules.master.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.peanut.modules.common.entity.SysCourseDirectEntity; +import com.peanut.modules.common.to.EditCourseRecordDto; + +public interface SysCourseDirectService extends IService { + + SysCourseDirectEntity editCourseRecord(EditCourseRecordDto editCourseRecordDto); +} diff --git a/src/main/java/com/peanut/modules/master/service/impl/SysCourseDirectServiceImpl.java b/src/main/java/com/peanut/modules/master/service/impl/SysCourseDirectServiceImpl.java new file mode 100644 index 00000000..79856e93 --- /dev/null +++ b/src/main/java/com/peanut/modules/master/service/impl/SysCourseDirectServiceImpl.java @@ -0,0 +1,36 @@ +package com.peanut.modules.master.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.peanut.modules.common.dao.SysCourseDirectDao; +import com.peanut.modules.common.entity.SysCourseDirectEntity; +import com.peanut.modules.common.to.EditCourseRecordDto; +import com.peanut.modules.master.service.SysCourseDirectService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +@Slf4j +@Service("masterSysCourseDirect") +public class SysCourseDirectServiceImpl extends ServiceImpl implements SysCourseDirectService { + + @Override + public SysCourseDirectEntity editCourseRecord(EditCourseRecordDto editCourseRecordDto) { + SysCourseDirectEntity one = this.getOne(new LambdaQueryWrapper().eq(SysCourseDirectEntity::getType, editCourseRecordDto.getType())); + switch (editCourseRecordDto.getRecordType()){ + case 0: + one.setBuyRecord(editCourseRecordDto.getContent()); + break; + case 1: + one.setUseRecord(editCourseRecordDto.getContent()); + break; + case 2: + one.setStudyRecord(editCourseRecordDto.getContent()); + break; + case 3: + one.setVipRecord(editCourseRecordDto.getContent()); + break; + } + this.updateById(one); + return one; + } +} diff --git a/src/main/java/com/peanut/modules/sociology/controller/CourseController.java b/src/main/java/com/peanut/modules/sociology/controller/CourseController.java index ec3086cf..508cae5d 100644 --- a/src/main/java/com/peanut/modules/sociology/controller/CourseController.java +++ b/src/main/java/com/peanut/modules/sociology/controller/CourseController.java @@ -12,8 +12,10 @@ import com.peanut.modules.common.dao.CourseCatalogueChapterVideoDao; import com.peanut.modules.common.entity.CourseCatalogueChapterEntity; import com.peanut.modules.common.entity.CourseCatalogueChapterVideoEntity; import com.peanut.modules.common.entity.CourseEntity; +import com.peanut.modules.common.entity.SysCourseDirectEntity; import com.peanut.modules.common.to.ParamTo; import com.peanut.modules.master.service.CourseCatalogueChapterVideoService; +import com.peanut.modules.master.service.SysCourseDirectService; import com.peanut.modules.sociology.service.CourseCatalogueChapterService; import com.peanut.modules.sociology.service.CourseService; import lombok.extern.slf4j.Slf4j; @@ -38,6 +40,8 @@ public class CourseController { private CourseCatalogueChapterService courseCatalogueChapterService; @Autowired private CourseCatalogueChapterVideoService courseCatalogueChapterVideoService; + @Autowired + private SysCourseDirectService sysCourseDirectService; /** * 获取用户最近学习课程列表 @@ -63,6 +67,16 @@ public class CourseController { return R.ok().put("courseList",marketCourseList); } + /** + * 获取课程说明 + * @return + */ + @RequestMapping("/getSociologyCourseRecord") + public R getSociologyCourseRecord(){ + SysCourseDirectEntity byId = sysCourseDirectService.getById(2); + return R.ok().put("result",byId); + } + /** * 获取国学课程价格 * @return From 3992f13fdf0ad284879ef56dc2b36d2e89d0930f Mon Sep 17 00:00:00 2001 From: wangjinlei <751475802@qq.com> Date: Thu, 23 May 2024 16:52:25 +0800 Subject: [PATCH 13/13] bug --- .../peanut/modules/book/controller/BuyOrderController.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java b/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java index 8179a363..605f1077 100644 --- a/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java +++ b/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java @@ -250,6 +250,11 @@ public class BuyOrderController { totalPrice = totalPrice.subtract(buyOrder.getJfDeduction()==null?BigDecimal.ZERO:buyOrder.getJfDeduction()); + + if(buyOrder.getRealMoney().compareTo(totalPrice)!=0){ + return R.error("系统错误订单金额异常！"); + } + String orderSn = IdWorker.getTimeId().substring(0, 32); buyOrder.setOrderSn(orderSn); if(buyOrder.getAddressId()!=0){