|
@@ -203,12 +203,12 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
|
|
|
vipUnitPrice = practiceGroupSellPrice.getVipOneStudentTwelveCourseActivityPriceWithNewUser(), highUnitPrice;
|
|
|
if(student.getIsNewUser()){
|
|
|
highUnitPrice = practiceGroupSellPrice.getHighOnlineTenCourseOriginalPriceWithNewUser();
|
|
|
- if(!additionCourseInfo.containsKey(CourseSchedule.CourseScheduleType.VIP)){
|
|
|
- additionCourseInfo.remove(CourseSchedule.CourseScheduleType.PRACTICE);
|
|
|
- }
|
|
|
if(additionCourseInfo.containsKey(CourseSchedule.CourseScheduleType.VIP)){
|
|
|
historyVipNum = historyVipNum + additionCourseInfo.get(CourseSchedule.CourseScheduleType.VIP);
|
|
|
}
|
|
|
+ if(historyVipNum<=0){
|
|
|
+ additionCourseInfo.remove(CourseSchedule.CourseScheduleType.PRACTICE);
|
|
|
+ }
|
|
|
if(additionCourseInfo.containsKey(CourseSchedule.CourseScheduleType.HIGH)){
|
|
|
historyHighNum = historyHighNum + additionCourseInfo.get(CourseSchedule.CourseScheduleType.HIGH);
|
|
|
}
|
|
@@ -226,7 +226,7 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
|
|
|
}
|
|
|
}else{
|
|
|
highUnitPrice = practiceGroupSellPrice.getHighOnlineTenCourseActivityPriceWithOldUser();
|
|
|
- if(!additionCourseInfo.containsKey(CourseSchedule.CourseScheduleType.HIGH)){
|
|
|
+ if(historyHighNum<=0){
|
|
|
additionCourseInfo.remove(CourseSchedule.CourseScheduleType.PRACTICE);
|
|
|
}
|
|
|
}
|