用户开课

用户vip

src/main/java/com/peanut/modules/master/controller/UserManageController.java

@@ -1,9 +1,10 @@
 package com.peanut.modules.master.controller;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.peanut.common.utils.R;
-import com.peanut.modules.common.entity.CourseEntity;
-import com.peanut.modules.common.entity.UserCourseBuyEntity;
+import com.peanut.modules.common.entity.*;
 import com.peanut.modules.master.service.CourseService;
+import com.peanut.modules.master.service.MyUserService;
 import com.peanut.modules.master.service.UserManageService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,6 +29,9 @@ public class UserManageController {
     @Autowired
     private CourseService courseService;
 
+    @Autowired
+    private MyUserService userService;
+
     //数据合并
     @RequestMapping("/userMerge")
     public R userMerge(@RequestBody Map<String, Object> params) {
@@ -40,13 +44,47 @@ public class UserManageController {
         return mergeService.addUserCourseBuy(userCourseBuyEntity);
     }
 
-    //课程列表带下级
+    //课程列表
     @RequestMapping("/courseAndChildrenList")
     public R courseAndChildrenList(@RequestBody Map<String, Object> params) {
         List<CourseEntity> list = courseService.courseAndChildrenList(params);
         return R.ok().put("list",list);
     }
 
+    //课程目录列表
+    @RequestMapping("/catalogueListByCourse")
+    public R catalogueListByCourse(@RequestBody Map<String, Object> params) {
+        List<CourseCatalogueEntity> list = courseService.catalogueListByCourse(params);
+        return R.ok().put("list",list);
+    }
+
+    //获取用户已有课程列表
+    @RequestMapping("/getUserCourseList")
+    public R getUserCourseList(@RequestBody Map<String, Object> params) {
+        Page<Map<String,Object>> page = courseService.getUserCourseList(params);
+        return R.ok().put("result",page);
+    }
+
+    //获取vip用户列表
+    @RequestMapping("/getVipList")
+    public R getVipList(@RequestBody Map<String, Object> params) {
+        Page<Map<String,Object>> page = userService.getVipList(params);
+        return R.ok().put("result",page);
+    }
+
+    //获取vip历史开通记录
+    @RequestMapping("/getVipHistoryList")
+    public R getVipHistoryList(@RequestBody Map<String, Object> params) {
+        Page<UserVip> page = userService.getVipHistoryList(params);
+        return R.ok().put("result",page);
+    }
+
+    //获取vip历史开通记录
+    @RequestMapping("/activateVIP")
+    public R activateVIP(@RequestBody UserVipLog vipLog) {
+        return userService.activateVIP(vipLog);
+    }
+