Merge branch 'master' of http://git.dayaedu.com/yonge/mec

mec-biz/src/main/java/com/ym/mec/biz/service/impl/OnlineMusicGroupServiceImpl.java

@@ -53,6 +53,8 @@ public class OnlineMusicGroupServiceImpl implements OnlineMusicGroupService {
     private CourseScheduleStudentPaymentDao courseScheduleStudentPaymentDao;
     @Autowired
     private TeacherAttendanceDao teacherAttendanceDao;
+    @Autowired
+    private TeacherDefaultMusicGroupSalaryDao teacherDefaultMusicGroupSalaryDao;
 
     @Transactional(rollbackFor = Exception.class, isolation = Isolation.DEFAULT)
     @Override
@@ -88,14 +90,6 @@ public class OnlineMusicGroupServiceImpl implements OnlineMusicGroupService {
         if(Objects.isNull(subjectDao)){
             throw new BizException("声部不存在");
         }
-        Set<String> holidayDays = new HashSet<>();
-
-        if (onlineMusicGroupCourseInfo.isSkipHoliday()) {
-            SysConfig holidaySetting = sysConfigService.findByParamName(SysConfigService.HOLIDAY_SETTING);
-            if(Objects.nonNull(holidaySetting)&& StringUtils.isNotBlank(holidaySetting.getParanValue())){
-                holidayDays = new HashSet<>(JSON.parseArray(holidaySetting.getParanValue(), String.class));
-            }
-        }
 
         onlineMusicGroupCourseInfo.setCourseCount(8);
         onlineMusicGroupCourseInfo.setSingleClassMinutes(25);
@@ -111,7 +105,7 @@ public class OnlineMusicGroupServiceImpl implements OnlineMusicGroupService {
         classGroup.setStudentNum(1);
         classGroup.setName(subject.getName()+"•"+student.getRealName());
         classGroup.setTotalClassTimes(courses.size());
-        classGroup.setType(ClassGroupTypeEnum.PRACTICE);
+        classGroup.setType(ClassGroupTypeEnum.MUSIC_NETWORK);
         classGroup.setDelFlag(0);
         classGroup.setGroupType(GroupType.MUSIC);
         classGroup.setMusicGroupId(musicGroup.getId());
@@ -152,27 +146,24 @@ public class OnlineMusicGroupServiceImpl implements OnlineMusicGroupService {
             courseSchedule.setCreateTime(now);
             courseSchedule.setUpdateTime(now);
             courseSchedule.setTeachMode(TeachModeEnum.ONLINE);
-            courseSchedule.setType(CourseSchedule.CourseScheduleType.PRACTICE);
+            courseSchedule.setType(CourseSchedule.CourseScheduleType.MUSIC_NETWORK);
             courseSchedule.setGroupType(GroupType.MUSIC);
             courseSchedule.setIsLock(1);
             courseSchedule.setOrganId(student.getOrganId());
         }
         courseScheduleDao.batchAddCourseSchedules(courses);
-//        TeacherDefaultPracticeGroupSalary teacherDefaultPracticeGroupSalary = teacherDefaultPracticeGroupSalaryDao.findByTeacherAndCourseMinutes(practiceGroupBuyParams.getUserId(),practiceCourseMinutes);
-//        BigDecimal teacherDefaultSalary=new BigDecimal(practiceCourseSalaryConfig.getParanValue());
-//        if(Objects.nonNull(teacherDefaultPracticeGroupSalary)){
-//            teacherDefaultSalary=teacherDefaultPracticeGroupSalary.getMainTeacherSalary();
-//        }
-//        BigDecimal studentSingleCourseCost=amount.divide(new BigDecimal(practiceCourses.size()), CommonConstants.DECIMAL_PLACE, BigDecimal.ROUND_DOWN);
+        TeacherDefaultMusicGroupSalary teacherDefaultMusicGroupSalary = teacherDefaultMusicGroupSalaryDao.findByTeacherAndCourseType(onlineMusicGroupCourseInfo.getTeacherId(), CourseSchedule.CourseScheduleType.MUSIC_NETWORK.getCode());
+        BigDecimal teacherDefaultSalary = JSON.parseObject(teacherDefaultMusicGroupSalary.getSalaryRuleJson()).getBigDecimal("1");
+        BigDecimal studentSingleCourseCost=BigDecimal.ZERO;
         for (CourseSchedule courseSchedule : courses) {
             //课程与老师薪水表
             CourseScheduleTeacherSalary courseScheduleTeacherSalary = new CourseScheduleTeacherSalary();
             courseScheduleTeacherSalary.setCourseScheduleId(courseSchedule.getId());
-            courseScheduleTeacherSalary.setGroupType(GroupType.PRACTICE);
+            courseScheduleTeacherSalary.setGroupType(GroupType.MUSIC);
             courseScheduleTeacherSalary.setMusicGroupId(musicGroup.getId());
             courseScheduleTeacherSalary.setTeacherRole(classGroupTeacherMapper.getTeacherRole());
             courseScheduleTeacherSalary.setUserId(onlineMusicGroupCourseInfo.getStudentId());
-//            courseScheduleTeacherSalary.setExpectSalary(teacherDefaultSalary);
+            courseScheduleTeacherSalary.setExpectSalary(teacherDefaultSalary);
             courseScheduleTeacherSalary.setCreateTime(now);
             courseScheduleTeacherSalary.setUpdateTime(now);
             courseScheduleTeacherSalary.setClassGroupId(classGroup.getId());
@@ -180,11 +171,11 @@ public class OnlineMusicGroupServiceImpl implements OnlineMusicGroupService {
 
             //学生缴费记录
             CourseScheduleStudentPayment courseScheduleStudentPayment = new CourseScheduleStudentPayment();
-            courseScheduleStudentPayment.setGroupType(GroupType.PRACTICE);
+            courseScheduleStudentPayment.setGroupType(GroupType.MUSIC);
             courseScheduleStudentPayment.setMusicGroupId(musicGroup.getId());
             courseScheduleStudentPayment.setCourseScheduleId(courseSchedule.getId());
             courseScheduleStudentPayment.setUserId(onlineMusicGroupCourseInfo.getStudentId());
-//            courseScheduleStudentPayment.setExpectPrice(studentSingleCourseCost);
+            courseScheduleStudentPayment.setExpectPrice(studentSingleCourseCost);
             courseScheduleStudentPayment.setClassGroupId(classGroup.getId());
             courseScheduleStudentPayment.setCreateTime(now);
             courseScheduleStudentPayment.setUpdateTime(now);
@@ -195,7 +186,7 @@ public class OnlineMusicGroupServiceImpl implements OnlineMusicGroupService {
             teacherAttendance.setMusicGroupId(musicGroup.getId());
             teacherAttendance.setTeacherId(onlineMusicGroupCourseInfo.getTeacherId());
             teacherAttendance.setClassGroupId(classGroup.getId());
-            teacherAttendance.setGroupType(GroupType.PRACTICE);
+            teacherAttendance.setGroupType(GroupType.MUSIC);
             teacherAttendance.setCourseScheduleId(courseSchedule.getId());
             teacherAttendance.setCreateTime(now);
             teacherAttendances.add(teacherAttendance);

mec-web/src/main/java/com/ym/mec/web/controller/education/EduOnlineMusicGroupController.java

@@ -3,11 +3,13 @@ package com.ym.mec.web.controller.education;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.EmployeeDao;
+import com.ym.mec.biz.dal.dto.OnlineMusicGroupCourseDto;
 import com.ym.mec.biz.dal.entity.Employee;
 import com.ym.mec.biz.dal.page.MusicGroupQueryInfo;
 import com.ym.mec.biz.service.MusicGroupService;
 import com.ym.mec.biz.service.OnlineMusicGroupService;
 import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.entity.HttpResponseResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
@@ -20,8 +22,8 @@ import org.springframework.web.bind.annotation.RestController;
 import java.util.Arrays;
 import java.util.List;
 
-@RequestMapping("eduCourseReview")
-@Api(tags = "教务端课程评价")
+@RequestMapping("eduOnlineMusic")
+@Api(tags = "教务端乐团网管课")
 @RestController
 public class EduOnlineMusicGroupController extends BaseController {
 
@@ -36,7 +38,7 @@ public class EduOnlineMusicGroupController extends BaseController {
 
     @ApiOperation(value = "分页查询乐团列表")
     @GetMapping("/queryPage")
-    @PreAuthorize("@pcs.hasPermissions('musicGroup/queryPage')")
+    @PreAuthorize("@pcs.hasPermissions('eduOnlineMusic/queryPage')")
     public Object queryPage(MusicGroupQueryInfo queryInfo) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
@@ -58,4 +60,16 @@ public class EduOnlineMusicGroupController extends BaseController {
         return succeed(musicGroupService.queryMusicGroupPage(queryInfo));
     }
 
+    @ApiOperation(value = "创建乐团网管课")
+    @GetMapping("/createOnlineMusicClassGroup")
+    @PreAuthorize("@pcs.hasPermissions('eduOnlineMusic/createOnlineMusicClassGroup')")
+    public HttpResponseResult createOnlineMusicClassGroup(OnlineMusicGroupCourseDto onlineMusicGroupCourseInfo){
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed("用户信息获取失败");
+        }
+        onlineMusicGroupService.createOnlineMusicClassGroup(onlineMusicGroupCourseInfo);
+        return succeed();
+    }
+
 }