'合并'

src/main/java/com/futu/course/course/controller/CourseController.java

@@ -27,7 +27,7 @@ public class CourseController {
      */
     @PostMapping("CourseGetOneById")
     public Course CourseGetOneById(@RequestBody CourseByIdDto id){
-        return courseService.getById(id.getId());
+        return courseService.CourseGetOneById(id);
     }
 
 

src/main/java/com/futu/course/course/service/impl/CourseServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.futu.course.common.entity.R;
 import com.futu.course.course.domain.Course;
+import com.futu.course.course.dto.CourseByIdDto;
 import com.futu.course.course.service.CourseService;
 import com.futu.course.course.mapper.CourseMapper;
 
@@ -42,6 +43,11 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
     private OrderItemMapper orderItemMapper;
 
 
+    @Autowired
+    private TeacherServiceImpl teacherService;
+    @Autowired
+    private ShopServiceImpl shopService;
+
 //    查询首页的课程
     @Override
     public R findAll() {
@@ -66,17 +72,15 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
 
 
 
-
-    @Autowired
-    TeacherServiceImpl teacherService;
-    @Autowired
-    ShopServiceImpl shopService;
-    public Course CourseGetOneById(@RequestParam Long id){
-        Course byId = this.getById(id);
+    public Course CourseGetOneById(@RequestParam CourseByIdDto id){
+        Course byId = this.getById(id.getId());
         byId.setShop(shopService.getById(byId.getShopId()));
         byId.setTeacher(teacherService.getById(byId.getTeacherId()));
         return byId;
     }
+
+
+
 }
 
 

src/main/java/com/futu/course/orders/controller/OrderController.java

@@ -24,4 +24,7 @@ public class OrderController {
     public List<Order1> OrderList(@RequestParam("status") int status) {
        return order1Service.OrderList(status);
     }
+
+
+
 }