|
|
@@ -370,14 +370,11 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
|
|
|
//未上课*0995手续费、以上课*0.8
|
|
|
List<StudentCourseInfoDto> history = courseScheduleDao.findUserCourseInfos(GroupType.MUSIC, musicGroupId, studentId, "history");
|
|
|
map.put(OrderDetailTypeEnum.COURSE.getCode(), sysUserCashAccountLogService.musicReturnFeeCharges(studentRegistration.getSurplusCourseFee(),history.size()));
|
|
|
-// if(history == null || history.size() == 0){
|
|
|
-// map.put(OrderDetailTypeEnum.COURSE.getCode(), studentRegistration.getSurplusCourseFee().multiply(new BigDecimal(0.995)).setScale(CommonConstants.DECIMAL_FINAL_PLACE, BigDecimal.ROUND_HALF_UP));
|
|
|
-// }else {
|
|
|
-// map.put(OrderDetailTypeEnum.COURSE.getCode(), studentRegistration.getSurplusCourseFee().multiply(new BigDecimal(0.8)).setScale(CommonConstants.DECIMAL_FINAL_PLACE, BigDecimal.ROUND_HALF_UP));
|
|
|
-// }
|
|
|
+
|
|
|
+
|
|
|
|
|
|
// 查询云教练订单
|
|
|
- BigDecimal cloudAmount = BigDecimal.ZERO;
|
|
|
+ /*BigDecimal cloudAmount = BigDecimal.ZERO;
|
|
|
List<Integer> studentIds = new ArrayList<Integer>();
|
|
|
studentIds.add(studentId);
|
|
|
List<CloudTeacherOrder> studentCloudTeacherOrders = cloudTeacherOrderService.getStudentCloudTeacherOrders(studentIds, musicGroupId);
|
|
|
@@ -393,7 +390,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- map.put(OrderDetailTypeEnum.CLOUD_TEACHER.getCode(), cloudAmount);
|
|
|
+ map.put(OrderDetailTypeEnum.CLOUD_TEACHER.getCode(), cloudAmount);*/
|
|
|
|
|
|
return map;
|
|
|
}
|
zouxuan