Merge branch 'feature/1113-vipCourse' of http://git.dayaedu.com/yonge/cooleshow into develop-new

cooleshow-app/src/main/java/com/yonge/cooleshow/student/controller/StudentCourseGroupController.java

@@ -1,5 +1,6 @@
 package com.yonge.cooleshow.student.controller;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yonge.cooleshow.biz.dal.dto.CheckCourseTimeDto;
 import com.yonge.cooleshow.biz.dal.entity.CourseTimeEntity;
 import com.yonge.cooleshow.biz.dal.entity.Subject;
@@ -94,5 +95,14 @@ public class StudentCourseGroupController extends BaseController {
         query.setStudentId(sysUserService.getUserId());
         return succeed(PageUtil.pageInfo(courseGroupService.studentCourseGroup(PageUtil.getPage(query), query)));
     }
+
+    @ApiOperation("学生端获取单个课程组")
+    @PostMapping("/getCourseGroup")
+    public HttpResponseResult<CourseGroupWrapper.StudentCourseGroupDto> getCourseGroup(Long courseGroupId) {
+        CourseGroupWrapper.TeacherCourseGroupQuery query = new CourseGroupWrapper.TeacherCourseGroupQuery();
+        query.setCourseGroupId(courseGroupId);
+        IPage<CourseGroupWrapper.StudentCourseGroupDto> pages = courseGroupService.studentCourseGroup(PageUtil.getPage(query), query);
+        return succeed(pages.getRecords().get(0));
+    }
 }
 

cooleshow-app/src/main/java/com/yonge/cooleshow/teacher/controller/TeacherCourseGroupController.java

@@ -144,6 +144,15 @@ public class TeacherCourseGroupController extends BaseController {
         return succeed(PageUtil.pageInfo(pages));
     }
 
+    @ApiOperation("老师端获取单个课程组")
+    @PostMapping("/getCourseGroup")
+    public HttpResponseResult<CourseGroupWrapper.TeacherCourseGroupDto> getCourseGroup(Long courseGroupId) {
+        CourseGroupWrapper.TeacherCourseGroupQuery query = new CourseGroupWrapper.TeacherCourseGroupQuery();
+        query.setCourseGroupId(courseGroupId);
+        IPage<CourseGroupWrapper.TeacherCourseGroupDto> pages = courseGroupService.teacherCourseGroup(PageUtil.getPage(query), query);
+        return succeed(pages.getRecords().get(0));
+    }
+
     @ApiOperation("获取课程组关联的学员")
     @PostMapping("/queryStudentByGroupId")
     public HttpResponseResult<List<CourseGroupWrapper.CourseStudentVo>> queryStudentByGroupId(Long groupId) {

cooleshow-app/src/main/java/com/yonge/cooleshow/teacher/controller/TeacherSubjectPriceController.java

@@ -9,6 +9,7 @@ import com.yonge.cooleshow.biz.dal.service.TeacherSubjectPriceService;
 import com.yonge.cooleshow.biz.dal.wrapper.TeacherSubjectPriceWrapper;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.yonge.toolset.base.exception.BizException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.collections.CollectionUtils;
@@ -37,9 +38,17 @@ public class TeacherSubjectPriceController extends BaseController {
 
     @ApiOperation(value = "新增、修改老师课程价格配置")
     @PostMapping("/saveOrUpdate")
-    public HttpResponseResult<Long> saveOrUpdate(@RequestBody TeacherSubjectPrice teacherSubjectPrice){
-        teacherSubjectPrice.setTeacherId(sysUserService.getUserId());
-        return succeed(teacherSubjectPriceService.upSet(teacherSubjectPrice));
+    public HttpResponseResult saveOrUpdate(@RequestBody List<TeacherSubjectPrice> teacherSubjectPriceList){
+        if (CollectionUtils.isEmpty(teacherSubjectPriceList)) {
+            throw new BizException("参数不能为空");
+        }
+        Long userId = sysUserService.getUserId();
+        for (TeacherSubjectPrice e : teacherSubjectPriceList) {
+            e.setTeacherId(userId);
+            e.setId(null);
+        }
+        teacherSubjectPriceService.upSet(teacherSubjectPriceList);
+        return succeed();
     }
 
     @ApiOperation(value = "删除老师课程价格配置")

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/TeacherSubjectPriceService.java

@@ -4,10 +4,12 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.yonge.cooleshow.biz.dal.dao.TeacherSubjectPriceDao;
 import com.yonge.cooleshow.biz.dal.entity.TeacherSubjectPrice;
 
+import java.util.List;
+
 public interface TeacherSubjectPriceService extends IService<TeacherSubjectPrice> {
 
     TeacherSubjectPriceDao getDao();
 
-    Long upSet(TeacherSubjectPrice teacherSubjectPrice);
+    void upSet(List<TeacherSubjectPrice> teacherSubjectPriceList);
 }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TeacherSubjectPriceServiceImpl.java

@@ -10,6 +10,8 @@ import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.List;
+
 @Service("TeacherSubjectPriceService")
 public class TeacherSubjectPriceServiceImpl extends ServiceImpl<TeacherSubjectPriceDao, TeacherSubjectPrice> implements TeacherSubjectPriceService {
 
@@ -22,29 +24,12 @@ public class TeacherSubjectPriceServiceImpl extends ServiceImpl<TeacherSubjectPr
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Long upSet(TeacherSubjectPrice teacherSubjectPrice) {
-        if (teacherSubjectPrice.getId() == null) {
-            TeacherSubjectPrice one = this.lambdaQuery().eq(TeacherSubjectPrice::getTeacherId, teacherSubjectPrice.getTeacherId())
-                    .eq(TeacherSubjectPrice::getSubjectId, teacherSubjectPrice.getSubjectId())
-                    .eq(TeacherSubjectPrice::getCourseType, teacherSubjectPrice.getCourseType()).one();
-            if (one != null) {
-                teacherSubjectPrice.setId(one.getId());
-                this.updateById(teacherSubjectPrice);
-            } else {
-                this.save(teacherSubjectPrice);
-            }
-        } else {
-            TeacherSubjectPrice one = this.lambdaQuery().ne(TeacherSubjectPrice::getId, teacherSubjectPrice.getId())
-                    .eq(TeacherSubjectPrice::getTeacherId, teacherSubjectPrice.getTeacherId())
-                    .eq(TeacherSubjectPrice::getSubjectId, teacherSubjectPrice.getSubjectId())
-                    .eq(TeacherSubjectPrice::getCourseType, teacherSubjectPrice.getCourseType()).one();
-            if (one != null) {
-                throw new BizException("已存在相同课程类型的课程价格配置");
-            } else {
-                this.updateById(teacherSubjectPrice);
-            }
-        }
-        return teacherSubjectPrice.getId();
+    public void upSet(List<TeacherSubjectPrice> teacherSubjectPriceList) {
+        Long teacherId = teacherSubjectPriceList.get(0).getTeacherId();
+        String courseType = teacherSubjectPriceList.get(0).getCourseType();
+        this.lambdaUpdate().eq(TeacherSubjectPrice::getTeacherId, teacherId)
+                .eq(TeacherSubjectPrice::getCourseType, courseType).remove();
+        this.saveBatch(teacherSubjectPriceList);
     }
 
 }