用户开课

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

@@ -1,31 +1,50 @@
 package com.peanut.modules.master.controller;
 
 import com.peanut.common.utils.R;
-import com.peanut.modules.master.service.UserMergeService;
+import com.peanut.modules.common.entity.CourseEntity;
+import com.peanut.modules.common.entity.UserCourseBuyEntity;
+import com.peanut.modules.master.service.CourseService;
+import com.peanut.modules.master.service.UserManageService;
 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;
+
+import java.util.List;
 import java.util.Map;
 
 /**
- * 合并用户
+ * 用户管理
  */
 @Slf4j
-@RestController("masterUserMerge")
-@RequestMapping("master/userMerge")
+@RestController("masterUserManage")
+@RequestMapping("master/userManage")
 public class UserMergeController {
 
     @Autowired
-    private UserMergeService mergeService;
-
+    private UserManageService mergeService;
 
+    @Autowired
+    private CourseService courseService;
 
+    //数据合并
     @RequestMapping("/userMerge")
     public R userMerge(@RequestBody Map<String, Object> params) {
-        mergeService.userMerge(params);
-        return null;
+        return mergeService.userMerge(params);
+    }
+
+    //手动开课
+    @RequestMapping("/addUserCourseBuy")
+    public R updateUserCourseBuy(@RequestBody UserCourseBuyEntity userCourseBuyEntity) {
+        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);
     }