1、陪练课调整

2、付费陪练课可预约时间调整

mec-biz/src/main/java/com/ym/mec/biz/service/PracticeGroupService.java

@@ -58,6 +58,15 @@ public interface PracticeGroupService extends BaseService<Long, PracticeGroup> {
     Map getPracticeApplyParams(Integer userId);
 
     /**
+     * @describe 获取陪练课可预约声部
+     * @author Joburgess
+     * @date 2020/3/5
+     * @param :
+     * @return com.ym.mec.common.entity.HttpResponseResult
+     */
+	Object getPracticeApplySubjects();
+
+    /**
      * @describe 获取可以预约的教师
      * @author Joburgess
      * @date 2020/2/9

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

@@ -768,6 +768,13 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
     }
 
     @Override
+    public Object getPracticeApplySubjects() {
+        SysConfig practiceSubjectIdListConfig = sysConfigService.findByParamName(SysConfigService.PRACTICE_SUBJECT_ID_LIST);
+        List<Subject> subjects = subjectDao.findBySubjectByIdList(practiceSubjectIdListConfig.getParanValue());
+        return subjects;
+    }
+
+    @Override
     public List<SimpleUserDto> getEnableApplyTeachers(Integer userId, Integer subjectId) {
         if (Objects.isNull(subjectId)) {
             throw new BizException("请选择声部");
@@ -2790,8 +2797,8 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         classGroupTeacherSalary.setClassGroupId(classGroup.getId());
         classGroupTeacherSalary.setTeacherRole(TeachTypeEnum.BISHOP);
         classGroupTeacherSalary.setUserId(practiceGroupBuyParams.getUserId());
-        classGroupTeacherSalary.setSalary(new BigDecimal(practiceCourseSalaryConfig.getParanValue(Integer.class)));
-        classGroupTeacherSalary.setOnlineClassesSalary(new BigDecimal(practiceCourseSalaryConfig.getParanValue(Integer.class)));
+        classGroupTeacherSalary.setSalary(new BigDecimal(practiceCourseSalaryConfig.getParanValue()));
+        classGroupTeacherSalary.setOnlineClassesSalary(new BigDecimal(practiceCourseSalaryConfig.getParanValue()));
         classGroupTeacherSalary.setGroupType(GroupType.PRACTICE);
         classGroupTeacherSalary.setCreateTime(now);
         classGroupTeacherSalary.setUpdateTime(now);

mec-web/src/main/java/com/ym/mec/web/controller/PracticeGroupManageController.java

@@ -73,6 +73,13 @@ public class PracticeGroupManageController extends BaseController {
         return succeed(practiceGroupService.findPracticeGroupCourseSchedules(queryInfo));
     }
 
+    @ApiOperation(value = "获取陪练课可预约声部")
+    @GetMapping(value = "/getPracticeApplySubjects")
+    @PreAuthorize("@pcs.hasPermissions('practiceGroupManage/getPracticeApplySubjects')")
+    public HttpResponseResult getPracticeApplySubjects(){
+        return succeed(practiceGroupService.getPracticeApplySubjects());
+    }
+
     @ApiOperation(value = "关闭课程组")
     @PostMapping(value = "/cancelGroup")
     @PreAuthorize("@pcs.hasPermissions('practiceGroupManage/cancelGroup')")