|
@@ -209,6 +209,9 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
|
|
|
if(additionCourseInfo.containsKey(CourseSchedule.CourseScheduleType.VIP)){
|
|
|
historyVipNum = historyVipNum + additionCourseInfo.get(CourseSchedule.CourseScheduleType.VIP);
|
|
|
}
|
|
|
+ if(additionCourseInfo.containsKey(CourseSchedule.CourseScheduleType.HIGH)){
|
|
|
+ historyHighNum = historyHighNum + additionCourseInfo.get(CourseSchedule.CourseScheduleType.HIGH);
|
|
|
+ }
|
|
|
boolean vipMoreThan2 = historyVipNum>=2;
|
|
|
if(vipMoreThan2){
|
|
|
if(FREE_PRICE_LEVEL.contains(degreeRegistration.getLevel())){
|
|
@@ -218,7 +221,7 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
|
|
|
}
|
|
|
highUnitPrice = practiceGroupSellPrice.getHighOnlineTenCourseActivityPriceWithNewUser();
|
|
|
}
|
|
|
- if(vipMoreThan2&&additionCourseInfo.containsKey(CourseSchedule.CourseScheduleType.HIGH)){
|
|
|
+ if(vipMoreThan2&&historyHighNum>0){
|
|
|
degreeRegistration.setTheoryMoney(BigDecimal.ZERO);
|
|
|
}
|
|
|
}else{
|