Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/IndexErrorType.java

@@ -15,8 +15,9 @@ public enum IndexErrorType implements BaseEnum<String, IndexErrorType> {
     STUDENT_NOT_PAYMENT("STUDENT_NOT_PAYMENT", "学员未缴费"),
     STUDENT_APPLY_FOR_QUIT_MUSIC_GROUP("STUDENT_APPLY_FOR_QUIT_MUSIC_GROUP", "学员退团申请"),
     WAIT_CREATE_PAYMENT_CALENDER("WAIT_CREATE_PAYMENT_CALENDER", "待创建缴费项目"),
-    COURSE_TRUANT_STUDENT_NUM("COURSE_TRUANT_STUDENT_NUM", "学员考情异常旷课"),
-    COURSE_LEAVE_STUDENT_NUM("COURSE_LEAVE_STUDENT_NUM", "请假"),
+    ATTENDANCE_ERR_STUDENT_NUM("COURSE_TRUANT_STUDENT_NUM", "学员考勤异常"),
+    COURSE_TRUANT_STUDENT_NUM("COURSE_TRUANT_STUDENT_NUM", "学员旷课"),
+    COURSE_LEAVE_STUDENT_NUM("COURSE_LEAVE_STUDENT_NUM", "学员请假"),
 
     TEACHER_INFO("TEACHER_INFO", "日常行政"),
     TEACHER_EXCEPTION_ATTENDANCE("TEACHER_EXCEPTION_ATTENDANCE", "老师考勤异常"),

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

@@ -709,8 +709,10 @@ public class EduPracticeGroupServiceImpl implements EduPracticeGroupService{
         courseScheduleDao.batchAddCourseSchedules(practiceCourses);
         TeacherDefaultPracticeGroupSalary teacherDefaultPracticeGroupSalary = teacherDefaultPracticeGroupSalaryDao.findByTeacherAndCourseMinutes(practiceGroupBuyParams.getUserId(),practiceCourseMinutes);
         BigDecimal teacherDefaultSalary=null;
-        if(Objects.nonNull(teacherDefaultPracticeGroupSalary)){
+        if(Objects.nonNull(teacherDefaultPracticeGroupSalary)&&PracticeGroupType.COME_ON_PACKAGE.equals(practiceGroupBuyParams.getType())){
             teacherDefaultSalary=teacherDefaultPracticeGroupSalary.getMainTeacherSalary();
+        }else{
+            teacherDefaultSalary = new BigDecimal(practiceCourseSalaryConfig.getParanValue());
         }
         if(teacherDefaultSalary == null){
             throw new BizException("请设置老师课酬");

mec-student/src/main/java/com/ym/mec/student/controller/ChargeTypeController.java

@@ -0,0 +1,29 @@
+package com.ym.mec.student.controller;
+
+import com.ym.mec.biz.dal.entity.ChargeType;
+import com.ym.mec.biz.service.ChargeTypeService;
+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.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+import java.util.List;
+
+@RequestMapping("chargeType")
+@Api(tags = "收费类型服务")
+@RestController
+public class ChargeTypeController extends BaseController {
+
+    @Autowired
+    private ChargeTypeService chargeTypeService;
+
+    @ApiOperation(value = "获取乐团收费类型")
+    @GetMapping("/findAll")
+    public HttpResponseResult<List<ChargeType>> findAll() {
+        return succeed(chargeTypeService.findAll(new HashMap<>()));
+    }
+
+}