|
@@ -530,18 +530,24 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
|
|
|
studentPaymentOrderService.insert(studentPaymentOrder);
|
|
|
//生成订单明细
|
|
|
List<StudentPaymentOrderDetail> studentPaymentOrderDetails = studentAddDto.getStudentPaymentOrderDetails();
|
|
|
- if (studentPaymentOrderDetails != null && studentPaymentOrderDetails.size() > 0) {
|
|
|
- studentPaymentOrderDetails.forEach(e -> {
|
|
|
- e.setPaymentOrderId(studentPaymentOrder.getId());
|
|
|
- });
|
|
|
- studentPaymentOrderDetailService.batchAdd(studentPaymentOrderDetails);
|
|
|
+ if (studentPaymentOrderDetails == null) {
|
|
|
+ studentPaymentOrderDetails = new ArrayList<>();
|
|
|
}
|
|
|
+ studentPaymentOrderDetails.forEach(e -> {
|
|
|
+ e.setPaymentOrderId(studentPaymentOrder.getId());
|
|
|
+ });
|
|
|
+ StudentPaymentOrderDetail studentPaymentOrderDetail = new StudentPaymentOrderDetail();
|
|
|
+ studentPaymentOrderDetail.setPaymentOrderId(studentPaymentOrder.getId());
|
|
|
+ studentPaymentOrderDetail.setPrice(studentAddDto.getTemporaryCourseFee());
|
|
|
+ studentPaymentOrderDetail.setType(OrderDetailTypeEnum.COURSE);
|
|
|
+ studentPaymentOrderDetails.add(studentPaymentOrderDetail);
|
|
|
+ studentPaymentOrderDetailService.batchAdd(studentPaymentOrderDetails);
|
|
|
}
|
|
|
studentRegistrationDao.updateCurrentClass(studentRegistration);
|
|
|
Map<Integer,String> receivers = new HashMap<>(1);
|
|
|
receivers.put(studentRegistration.getUserId(),studentRegistration.getParentsPhone());
|
|
|
sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.YIMEI,MessageTypeEnum.SMS_MUSIC_GROUP_ADD_STUDENT,
|
|
|
- receivers,null,0,null,studentRegistration.getParentsName(),musicGroup.getName());
|
|
|
+ receivers,null,0,null,studentRegistration.getParentsName(),studentRegistration.getName(),musicGroup.getName());
|
|
|
return userId;
|
|
|
}
|
|
|
}
|