1、支持修改vip课课程单价

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

@@ -575,7 +575,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
         ClassGroupTeacherSalary classGroupTeacherSalary = classGroupTeacherSalaryDao.findByVipGoupAndTeacher(vipGroupId, vipGroup.getUserId());
         BigDecimal onlineTeacherSalary,
                 offlineTeacherSalary;
-        if(oldStudentNum==0){
+        if(oldStudentNum==0||Objects.isNull(classGroupTeacherSalary)){
             TeacherDefaultVipGroupSalary teacherDefaultVipGroupSalary = teacherDefaultVipGroupSalaryDao.findByTeacherAndCategory(vipGroup.getUserId(),
                     vipGroup.getVipGroupCategoryId());
             VipGroupCategory vipGroupCategory = vipGroupCategoryDao.get(vipGroup.getVipGroupCategoryId().intValue());
@@ -586,6 +586,18 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
             onlineTeacherSalary=classGroupTeacherSalary.getOnlineClassesSalary();
             offlineTeacherSalary=classGroupTeacherSalary.getSalary();
         }
+
+        if(Objects.isNull(classGroupTeacherSalary)){
+            ClassGroup classGroup = classGroupDao.findByMusicGroupAndType(vipGroupId.toString(), GroupType.VIP.getCode());
+            classGroupTeacherSalary=new ClassGroupTeacherSalary();
+            classGroupTeacherSalary.setGroupType(GroupType.VIP);
+            classGroupTeacherSalary.setMusicGroupId(vipGroupId.toString());
+            classGroupTeacherSalary.setClassGroupId(classGroup.getId());
+            classGroupTeacherSalary.setTeacherRole(TeachTypeEnum.BISHOP);
+            classGroupTeacherSalary.setUserId(vipGroup.getUserId());
+            classGroupTeacherSalaryDao.insert(classGroupTeacherSalary);
+        }
+
         BigDecimal studentNumDecimal = new BigDecimal(studentNum);
         BigDecimal oldStudentNumDecimal = new BigDecimal(oldStudentNum);
 

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

@@ -1694,15 +1694,20 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 
         ClassGroupTeacherSalary classGroupTeacherSalary = classGroupTeacherSalaryDao.findByVipGoupAndTeacher(vipGroup.getId().intValue(), vipGroup.getUserId());
 
-		BigDecimal onlineTeacherSalary,offlineTeacherSalary,zero=new BigDecimal(0);
+		BigDecimal onlineTeacherSalary=null,offlineTeacherSalary=null,zero=new BigDecimal(0);
 		if(Objects.nonNull(classGroupTeacherSalary)){
             onlineTeacherSalary=classGroupTeacherSalary.getOnlineClassesSalary();
             offlineTeacherSalary=classGroupTeacherSalary.getSalary();
-		}else{
+		}
+
+		if(Objects.isNull(onlineTeacherSalary)){
 		    onlineTeacherSalary = new BigDecimal(0);
-		    offlineTeacherSalary = new BigDecimal(0);
         }
 
+		if(Objects.isNull(offlineTeacherSalary)){
+			offlineTeacherSalary = new BigDecimal(0);
+		}
+
 		if(onlineTeacherSalary.compareTo(zero)<=0
                 &&offlineTeacherSalary.compareTo(zero)<=0){
             TeacherDefaultVipGroupSalary byTeacherAndCategory = teacherDefaultVipGroupSalaryDao.findByTeacherAndCategory(vipGroup.getUserId(), vipGroup.getVipGroupCategoryId());