|
@@ -344,17 +344,12 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
|
|
}
|
|
}
|
|
List<VipGroupStudentCoursePrice> vscps = vipGroup.getVipGroupApplyBaseInfo().getVipGroupStudentCoursePrices();
|
|
List<VipGroupStudentCoursePrice> vscps = vipGroup.getVipGroupApplyBaseInfo().getVipGroupStudentCoursePrices();
|
|
|
|
|
|
- //计算课程相关费用信息
|
|
|
|
- Map<String, BigDecimal> costInfo = Maps.newHashMap();
|
|
|
|
-
|
|
|
|
// VIP课参数校验
|
|
// VIP课参数校验
|
|
if (CourseSchedule.CourseScheduleType.VIP.getCode().equals(groupType)) {
|
|
if (CourseSchedule.CourseScheduleType.VIP.getCode().equals(groupType)) {
|
|
|
|
|
|
// 校验VIP课参数
|
|
// 校验VIP课参数
|
|
vipGroupRequestParamValid(vipGroup, vipGroupApplyBaseInfoDto, totalClassTimes, firstCourseSchedule, latestCourseSchedule);
|
|
vipGroupRequestParamValid(vipGroup, vipGroupApplyBaseInfoDto, totalClassTimes, firstCourseSchedule, latestCourseSchedule);
|
|
|
|
|
|
- // 计算老师课薪
|
|
|
|
- costInfo = countVipGroupPredictFee1(vipGroupApplyBaseInfoDto, vipGroupApplyBaseInfoDto.getUserId(), null);
|
|
|
|
}
|
|
}
|
|
|
|
|
|
// LIVE课参数校验
|
|
// LIVE课参数校验
|
|
@@ -377,6 +372,12 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
|
|
vipGroupApplyBaseInfoDto.setName(className.toString());
|
|
vipGroupApplyBaseInfoDto.setName(className.toString());
|
|
vipGroupDao.insert(vipGroupApplyBaseInfoDto);
|
|
vipGroupDao.insert(vipGroupApplyBaseInfoDto);
|
|
|
|
|
|
|
|
+ Map<String, BigDecimal> costInfo = Maps.newHashMap();
|
|
|
|
+ //计算课程相关费用信息
|
|
|
|
+ if (CourseSchedule.CourseScheduleType.VIP.getCode().equals(groupType)) {
|
|
|
|
+ // 计算老师课薪
|
|
|
|
+ costInfo = countVipGroupPredictFee1(vipGroupApplyBaseInfoDto, vipGroupApplyBaseInfoDto.getUserId(), null);
|
|
|
|
+ }
|
|
|
|
|
|
vipGroupApplyBaseInfoDto.setAuditStatus(AuditStatusEnum.PASS);
|
|
vipGroupApplyBaseInfoDto.setAuditStatus(AuditStatusEnum.PASS);
|
|
|
|
|