|
@@ -82,7 +82,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
|
|
|
|
|
|
@Override
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
- public boolean create(MusicGroupPaymentCalender musicGroupPaymentCalender) {
|
|
|
+ public Long create(MusicGroupPaymentCalender musicGroupPaymentCalender) {
|
|
|
|
|
|
String musicGroupId = musicGroupPaymentCalender.getMusicGroupId();
|
|
|
|
|
@@ -97,7 +97,6 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
|
|
|
}
|
|
|
Date date = new Date();
|
|
|
Map<Integer, String> pushUserMap = new HashMap<>();
|
|
|
- MusicGroupPaymentCalenderDetail musicGroupPaymentCalenderDetail = null;
|
|
|
List<MusicGroupPaymentCalenderDetail> musicGroupPaymentCalenderDetailList = new ArrayList<>();
|
|
|
musicGroupPaymentCalender.setOperator(sysUser.getId());
|
|
|
musicGroupPaymentCalender.setCreateTime(date);
|
|
@@ -160,36 +159,6 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
|
|
|
}
|
|
|
|
|
|
musicGroupPaymentCalender.setExpectNum(0);
|
|
|
- if(StringUtils.isNoneBlank(musicGroupPaymentCalender.getStudentIds())){
|
|
|
- String[] sutdentIdList = musicGroupPaymentCalender.getStudentIds().split(",");
|
|
|
- musicGroupPaymentCalender.setExpectNum(sutdentIdList.length);
|
|
|
-
|
|
|
- if (musicGroupPaymentCalender.getStatus() == PaymentCalenderStatusEnum.OPEN) {
|
|
|
- for(String studentId : sutdentIdList){
|
|
|
- pushUserMap.put(Integer.parseInt(studentId), studentId);
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- BigDecimal totalPrice = new BigDecimal(0);
|
|
|
- //相同类型的课程如果修改了课程费用,需要走审批
|
|
|
- for(Entry<CourseScheduleType, BigDecimal> entry : currentCoursePrice.entrySet()){
|
|
|
- totalPrice.add(entry.getValue());
|
|
|
- }
|
|
|
- //创建缴费明细
|
|
|
- for(String studentId : sutdentIdList){
|
|
|
- musicGroupPaymentCalenderDetail = new MusicGroupPaymentCalenderDetail();
|
|
|
- musicGroupPaymentCalenderDetail.setMusicGroupPaymentCalenderId(musicGroupPaymentCalender.getId());
|
|
|
- musicGroupPaymentCalenderDetail.setCreateTime(date);
|
|
|
- musicGroupPaymentCalenderDetail.setExpectAmount(totalPrice);
|
|
|
- musicGroupPaymentCalenderDetail.setPaymentStatus(PaymentStatus.NON_PAYMENT);
|
|
|
- musicGroupPaymentCalenderDetail.setUpdateTime(date);
|
|
|
- musicGroupPaymentCalenderDetail.setUserId(Integer.parseInt(studentId));
|
|
|
- musicGroupPaymentCalenderDetail.setStartPaymentDate(musicGroupPaymentCalender.getStartPaymentDate());
|
|
|
- musicGroupPaymentCalenderDetail.setDeadlinePaymentDate(musicGroupPaymentCalender.getDeadlinePaymentDate());
|
|
|
-
|
|
|
- musicGroupPaymentCalenderDetailList.add(musicGroupPaymentCalenderDetail);
|
|
|
- }
|
|
|
- }
|
|
|
//设置批次号
|
|
|
musicGroupPaymentCalender.setBatchNo(idGeneratorService.generatorId()+"");
|
|
|
musicGroupPaymentCalenderDao.insert(musicGroupPaymentCalender);
|
|
@@ -214,7 +183,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
|
|
|
sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.STUDENT_PUSH_WAIT_RENEW_MESSAGE,
|
|
|
pushUserMap, null, 0, memo, "STUDENT", musicGroup.getName());
|
|
|
}
|
|
|
- return true;
|
|
|
+ return musicGroupPaymentCalender.getId();
|
|
|
}
|
|
|
|
|
|
@Override
|