1、vip课课程申请逻辑调整

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

@@ -582,22 +582,25 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
         ClassGroupTeacherSalary classGroupTeacherSalary = classGroupTeacherSalaryDao.findByVipGoupAndTeacher(vipGroupId, vipGroup.getUserId());
         BigDecimal onlineTeacherSalary,
                 offlineTeacherSalary;
-        if((oldStudentNum==0&&vipGroupStatusEnum.equals(VipGroupStatusEnum.APPLYING))
+        if((oldStudentNum==0&&!vipGroupStatusEnum.equals(VipGroupStatusEnum.APPLYING))
                 ||Objects.isNull(classGroupTeacherSalary)){
             TeacherDefaultVipGroupSalary teacherDefaultVipGroupSalary = teacherDefaultVipGroupSalaryDao.findByTeacherAndCategory(vipGroup.getUserId(),
                     vipGroup.getVipGroupCategoryId());
-            VipGroupCategory vipGroupCategory = vipGroupCategoryDao.get(vipGroup.getVipGroupCategoryId().intValue());
             if(Objects.isNull(teacherDefaultVipGroupSalary)){
                 throw new BizException("请设置课酬");
             }
             onlineTeacherSalary=teacherDefaultVipGroupSalary.getOnlineClassesSalary();
             offlineTeacherSalary=teacherDefaultVipGroupSalary.getOfflineClassesSalary();
-            oldStudentNum = vipGroupCategory.getStudentNum();
         }else{
             onlineTeacherSalary=classGroupTeacherSalary.getOnlineClassesSalary();
             offlineTeacherSalary=classGroupTeacherSalary.getSalary();
         }
 
+        if(oldStudentNum==0){
+            VipGroupCategory vipGroupCategory = vipGroupCategoryDao.get(vipGroup.getVipGroupCategoryId().intValue());
+            oldStudentNum = vipGroupCategory.getStudentNum();
+        }
+
         if(Objects.isNull(classGroupTeacherSalary)){
             ClassGroup classGroup = classGroupDao.findByMusicGroupAndType(vipGroupId.toString(), GroupType.VIP.getCode());
             classGroupTeacherSalary=new ClassGroupTeacherSalary();