|
@@ -488,16 +488,25 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
|
|
|
maintenanceOrderDetail.setIsRenew(0);
|
|
|
studentPaymentOrderDetailList.add(maintenanceOrderDetail);
|
|
|
}
|
|
|
+
|
|
|
+ MusicGroup musicGroup = musicGroupDao.get(studentRegistration.getMusicGroupId());
|
|
|
+
|
|
|
//云教练/云教练+
|
|
|
if (buyCloudTeacher || buyCloudTeacherPlus) {
|
|
|
- // OrganizationCloudTeacherFee cloudTeacher = organizationCloudTeacherFeeDao.getByOrganId(studentRegistration.getOrganId());
|
|
|
- // BigDecimal cloudTeacherPrice = buyCloudTeacher ? cloudTeacher.getPrice() : cloudTeacher.getPlusPrice();
|
|
|
-
|
|
|
- MusicGroupPaymentCalender musicGroupRegCalender = musicGroupPaymentCalenderDao.getMusicGroupRegCalender(studentRegistration.getMusicGroupId());
|
|
|
- if(musicGroupRegCalender == null){
|
|
|
- throw new BizException("缴费信息不存在");
|
|
|
- }
|
|
|
- BigDecimal cloudTeacherPrice = musicGroupRegCalender.getMemberPaymentAmount();
|
|
|
+
|
|
|
+ BigDecimal cloudTeacherPrice = BigDecimal.ZERO;
|
|
|
+
|
|
|
+ if(musicGroup.getCloudTeacherType() != null){
|
|
|
+ OrganizationCloudTeacherFee cloudTeacher = organizationCloudTeacherFeeDao.getByOrganId(studentRegistration.getOrganId());
|
|
|
+ cloudTeacherPrice = musicGroup.getCloudTeacherType() == 0 ? cloudTeacher.getPrice() : cloudTeacher.getPlusPrice();
|
|
|
+ }else {
|
|
|
+ MusicGroupPaymentCalender musicGroupRegCalender = musicGroupPaymentCalenderDao.getMusicGroupRegCalender(studentRegistration.getMusicGroupId());
|
|
|
+ if(musicGroupRegCalender == null){
|
|
|
+ throw new BizException("缴费信息不存在");
|
|
|
+ }
|
|
|
+
|
|
|
+ cloudTeacherPrice = musicGroupRegCalender.getMemberPaymentAmount();
|
|
|
+ }
|
|
|
|
|
|
OrderDetailTypeEnum orderDetailTypeEnum = OrderDetailTypeEnum.CLOUD_TEACHER;
|
|
|
StudentPaymentOrderDetail cloudTeacherOrderDetail = new StudentPaymentOrderDetail();
|
|
@@ -512,8 +521,6 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
|
|
|
}
|
|
|
studentPaymentOrderDetailService.batchAdd(studentPaymentOrderDetailList);
|
|
|
|
|
|
- MusicGroup musicGroup = musicGroupDao.get(studentRegistration.getMusicGroupId());
|
|
|
-
|
|
|
//增加缴费学生数,0元订单不增加报名人数(没买云教练/云教练+的)
|
|
|
boolean paidZeroFlag = false;
|
|
|
boolean firstPaidZeroFlag = false;
|