1

src/main/java/com/peanut/modules/common/dao/CourseMarketDao.java

@@ -0,0 +1,9 @@
+package com.peanut.modules.common.dao;
+
+import com.github.yulichang.base.MPJBaseMapper;
+import com.peanut.modules.common.entity.CourseMarketEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface CourseMarketDao extends MPJBaseMapper<CourseMarketEntity> {
+}

src/main/java/com/peanut/modules/common/dao/CourseToMarketDao.java

@@ -0,0 +1,9 @@
+package com.peanut.modules.common.dao;
+
+import com.github.yulichang.base.MPJBaseMapper;
+import com.peanut.modules.common.entity.CourseToMarketEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface CourseToMarketDao extends MPJBaseMapper<CourseToMarketEntity> {
+}

src/main/java/com/peanut/modules/common/dao/ShopProductDao.java

@@ -1,5 +1,6 @@
 package com.peanut.modules.common.dao;
 
+import com.github.yulichang.base.MPJBaseMapper;
 import com.peanut.modules.common.entity.ShopProduct;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
@@ -14,7 +15,7 @@ import java.util.List;
  * @date 2022-10-28 09:43:14
  */
 @Mapper
-public interface ShopProductDao extends BaseMapper<ShopProduct> {
+public interface ShopProductDao extends MPJBaseMapper<ShopProduct> {
 
     List<ShopProduct> appGetCategoryList(Integer catId);
 

src/main/java/com/peanut/modules/common/entity/CourseMarketEntity.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;
+
+import java.util.Date;
+
+@Data
+@TableName("course_market")
+public class CourseMarketEntity {
+    @TableId
+    private Integer id;
+
+    private Integer pid;
+
+    private Integer isLast;
+
+    private String title;
+
+    private Integer sort;
+
+    private Date createTime;
+
+    @TableLogic
+    private Integer delFlag;
+}

src/main/java/com/peanut/modules/common/entity/CourseToMarketEntity.java

@@ -0,0 +1,25 @@
+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;
+
+import java.util.Date;
+
+@Data
+@TableName("course_to_market")
+public class CourseToMarketEntity {
+
+    @TableId
+    private Integer id;
+
+    private Integer courseId;
+
+    private Integer sociologyId;
+
+    private Date createTime;
+
+    @TableLogic
+    private Integer delFlag;
+}

src/main/java/com/peanut/modules/sociology/controller/CourseController.java

@@ -3,6 +3,7 @@ package com.peanut.modules.sociology.controller;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.peanut.common.utils.R;
 import com.peanut.common.utils.ShiroUtils;
+import com.peanut.modules.common.entity.CourseEntity;
 import com.peanut.modules.common.to.ParamTo;
 import com.peanut.modules.sociology.service.CourseService;
 import lombok.extern.slf4j.Slf4j;
@@ -19,6 +20,11 @@ public class CourseController {
     @Autowired
     private CourseService courseService;
 
+    /**
+     * 获取用户最近学习课程列表
+     * @param param
+     * @return
+     */
     @RequestMapping("/getUserLateCourseList")
     public R getUserLateCourseList(@RequestBody ParamTo param){
         Integer userId = ShiroUtils.getUId();
@@ -27,4 +33,26 @@ public class CourseController {
         return R.ok().put("page",userLateCourseList);
     }
 
+    /**
+     * 获取营销标签下的课程列表
+     * @param param
+     * @return
+     */
+    @RequestMapping("/getMarketCourseList")
+    public R getMarketCourseList(@RequestBody ParamTo param){
+        Page<CourseEntity> marketCourseList = courseService.getMarketCourseList(param);
+        return R.ok().put("courseList",marketCourseList);
+    }
+
+    /**
+     * 获取国学标签下的课程列表
+     * @param param
+     * @return
+     */
+    @RequestMapping("/getSociologyCourseList")
+    public R getSociologyCourseList(@RequestBody ParamTo param){
+        Page sociologyCourseList = courseService.getSociologyCourseList(param);
+        return R.ok().put("courses",sociologyCourseList);
+    }
+
 }

src/main/java/com/peanut/modules/sociology/controller/HomeController.java

@@ -33,19 +33,16 @@ public class HomeController {
         return R.ok().put("myCourse",courseList);
     }
 
+    /**
+     *获取国学标签列表
+     * @param param
+     * @return
+     */
     @RequestMapping("/getSociologyLabels")
     public R getSociologyLabels(@RequestBody ParamTo param){
         List<CourseSociologyEntity> sociologyLabels = courseSociologyService.getSociologyLabels(param.getId());
         return R.ok().put("labels",sociologyLabels);
     }
 
-    @RequestMapping("/getSociologyCourseList")
-    public R getSociologyCourseList(@RequestBody ParamTo param){
-        Page sociologyCourseList = courseService.getSociologyCourseList(param);
-        return R.ok().put("courses",sociologyCourseList);
-    }
-
-
-
 
 }

src/main/java/com/peanut/modules/sociology/controller/ProductController.java

@@ -1,14 +0,0 @@
-package com.peanut.modules.sociology.controller;
-
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@Slf4j
-@RestController("sociologyProduct")
-@RequestMapping("sociology/product")
-public class ProductController {
-
-
-
-}

src/main/java/com/peanut/modules/sociology/controller/ShopProductController.java

@@ -0,0 +1,27 @@
+package com.peanut.modules.sociology.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.peanut.common.utils.R;
+import com.peanut.modules.common.to.ParamTo;
+import com.peanut.modules.sociology.service.ShopProductService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Slf4j
+@RestController("sociologyProduct")
+@RequestMapping("sociology/product")
+public class ShopProductController {
+    @Autowired
+    private ShopProductService shopProductService;
+
+    @RequestMapping("/getMarketProductList")
+    public R getMarketProductList(@RequestBody ParamTo param){
+        Page marketProductList = shopProductService.getMarketProductList(param);
+        return R.ok().put("products",marketProductList);
+    }
+
+
+}

src/main/java/com/peanut/modules/sociology/service/CourseService.java

@@ -17,4 +17,6 @@ public interface CourseService extends IService<CourseEntity> {
 
     Page<CourseEntity> getUserLateCourseList(ParamTo param);
 
+    Page<CourseEntity> getMarketCourseList(ParamTo param);
+
 }

src/main/java/com/peanut/modules/sociology/service/ShopProductService.java

@@ -0,0 +1,11 @@
+package com.peanut.modules.sociology.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.peanut.modules.common.entity.ShopProduct;
+import com.peanut.modules.common.to.ParamTo;
+
+public interface ShopProductService extends IService<ShopProduct> {
+
+    Page getMarketProductList(ParamTo param);
+}

src/main/java/com/peanut/modules/sociology/service/impl/CourseServiceImpl.java

@@ -8,6 +8,7 @@ import com.peanut.modules.common.dao.CourseDao;
 import com.peanut.modules.common.dao.CourseToSociologyDao;
 import com.peanut.modules.common.dao.UserToCourseDao;
 import com.peanut.modules.common.entity.CourseEntity;
+import com.peanut.modules.common.entity.CourseToMarketEntity;
 import com.peanut.modules.common.entity.CourseToSociologyEntity;
 import com.peanut.modules.common.entity.UserToCourseEntity;
 import com.peanut.modules.common.to.ParamTo;
@@ -65,6 +66,17 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
         wrapper.selectAll(CourseEntity.class);
         wrapper.leftJoin(UserToCourseEntity.class,UserToCourseEntity::getCourseId,CourseEntity::getId);
         wrapper.eq(UserToCourseEntity::getUserId,param.getId());
+        wrapper.orderByDesc(UserToCourseEntity::getUpdateTime);
+        Page<CourseEntity> courseEntityPage = this.getBaseMapper().selectJoinPage(new Page<>(param.getPage(), param.getLimit()), CourseEntity.class, wrapper);
+        return courseEntityPage;
+    }
+
+    @Override
+    public Page<CourseEntity> getMarketCourseList(ParamTo param) {
+        MPJLambdaWrapper<CourseEntity> wrapper = new MPJLambdaWrapper<>();
+        wrapper.selectAll(CourseEntity.class);
+        wrapper.leftJoin(CourseToMarketEntity.class,CourseToMarketEntity::getCourseId,CourseEntity::getId);
+        wrapper.eq(CourseToMarketEntity::getId,param.getId());
         Page<CourseEntity> courseEntityPage = this.getBaseMapper().selectJoinPage(new Page<>(param.getPage(), param.getLimit()), CourseEntity.class, wrapper);
         return courseEntityPage;
     }

src/main/java/com/peanut/modules/sociology/service/impl/ShopProductServiceImpl.java

@@ -0,0 +1,27 @@
+package com.peanut.modules.sociology.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import com.peanut.modules.common.dao.ShopProductDao;
+import com.peanut.modules.common.entity.ShopProduct;
+import com.peanut.modules.common.entity.ShopProductToSociologyMarket;
+import com.peanut.modules.common.to.ParamTo;
+import com.peanut.modules.sociology.service.ShopProductService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service("sociologyShopProduct")
+public class ShopProductServiceImpl extends ServiceImpl<ShopProductDao, ShopProduct> implements ShopProductService {
+
+    @Override
+    public Page getMarketProductList(ParamTo param) {
+        MPJLambdaWrapper<ShopProduct> wrapper = new MPJLambdaWrapper<>();
+        wrapper.selectAll(ShopProduct.class);
+        wrapper.leftJoin(ShopProductToSociologyMarket.class,ShopProductToSociologyMarket::getProductId,ShopProduct::getProductId);
+        wrapper.eq(ShopProductToSociologyMarket::getSociologyMarketId,param.getId());
+        Page<ShopProduct> shopProductPage = this.getBaseMapper().selectJoinPage(new Page<>(param.getPage(), param.getLimit()), ShopProduct.class, wrapper);
+        return shopProductPage;
+    }
+}