|
|
@@ -3465,6 +3465,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
|
|
|
if(vipGroup.getStatus().equals(VipGroupStatusEnum.CANCEL)){
|
|
|
throw new BizException("不能对已停止的课程进行退课操作");
|
|
|
}
|
|
|
+ VipGroupCategory vipGroupCategory = vipGroupCategoryDao.get(vipGroup.getVipGroupCategoryId().intValue());
|
|
|
Map<String,BigDecimal> result = new HashMap<>();
|
|
|
Date now = new Date();
|
|
|
BigDecimal bigDecimal;
|
|
|
@@ -3473,12 +3474,15 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
|
|
|
if(vipGroup.getVipGroupActivityId() != null){
|
|
|
ActivityUserMapper activityUserMapper = activityUserMapperService.findByStudentId(vipGroupId, studentId);
|
|
|
if(Objects.nonNull(activityUserMapper.getVipGroupId())){
|
|
|
+ VipGroup group = vipGroupDao.get(activityUserMapper.getVipGroupId());
|
|
|
+ vipGroupCategory = vipGroupCategoryDao.get(group.getVipGroupCategoryId().intValue());
|
|
|
userCourseInfos.addAll(courseScheduleDao.findUserCourseInfos(GroupType.VIP, activityUserMapper.getVipGroupId().toString(), studentId, null));
|
|
|
}
|
|
|
if(Objects.nonNull(activityUserMapper.getGiveVipGroupId())){
|
|
|
userCourseInfos.addAll(courseScheduleDao.findUserCourseInfos(GroupType.VIP, activityUserMapper.getGiveVipGroupId().toString(), studentId, null));
|
|
|
}
|
|
|
if(Objects.nonNull(activityUserMapper.getPracticeGroupId())){
|
|
|
+ vipGroupCategory = vipGroupCategoryDao.get(1);
|
|
|
userCourseInfos.addAll(courseScheduleDao.findUserCourseInfos(GroupType.PRACTICE, activityUserMapper.getPracticeGroupId().toString(), studentId, null));
|
|
|
}
|
|
|
if(Objects.nonNull(activityUserMapper.getGivePracticeGroupId())){
|
|
|
@@ -3528,8 +3532,6 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
|
|
|
bigDecimal = new BigDecimal(0);
|
|
|
}
|
|
|
|
|
|
- VipGroupCategory vipGroupCategory = vipGroupCategoryDao.get(vipGroup.getVipGroupCategoryId().intValue());
|
|
|
-
|
|
|
if(vipGroupCategory.getStudentNum() <= 1){
|
|
|
bigDecimal = bigDecimal.multiply(new BigDecimal(0.8)).setScale(CommonConstants.DECIMAL_FINAL_PLACE, BigDecimal.ROUND_HALF_UP);
|
|
|
}else{
|
zouxuan