1

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);
+    }
+
+
+}