|
|
@@ -508,6 +508,7 @@ public class MusicGroupPaymentCalenderDetailServiceImpl extends BaseServiceImpl<
|
|
|
Map<Integer,MusicGroupPaymentCalenderDetail> userMap = new HashMap<Integer, MusicGroupPaymentCalenderDetail>();
|
|
|
List<MusicGroupPaymentCalenderDetail> musicGroupPaymentCalenderDetailList = new ArrayList<MusicGroupPaymentCalenderDetail>();
|
|
|
//创建缴费明细
|
|
|
+ MusicGroup musicGroup = musicGroupDao.get(musicGroupId);
|
|
|
for(Integer studentId : userIdList){
|
|
|
musicGroupPaymentCalenderDetail = new MusicGroupPaymentCalenderDetail();
|
|
|
musicGroupPaymentCalenderDetail.setMusicGroupPaymentCalenderId(musicGroupPaymentCalenderId);
|
|
|
@@ -526,6 +527,25 @@ public class MusicGroupPaymentCalenderDetailServiceImpl extends BaseServiceImpl<
|
|
|
musicGroupPaymentCalenderDetail.setResponsibleUserId(musicGroupPaymentCalender.getOperator());
|
|
|
|
|
|
musicGroupPaymentCalenderDetailList.add(musicGroupPaymentCalenderDetail);
|
|
|
+ if (expectAmount.doubleValue() == 0d && expectMemberAmount.doubleValue() == 0d) {
|
|
|
+ // 添加会员有效时长
|
|
|
+ if(musicGroupPaymentCalender.getMemberRankSettingId() != null){
|
|
|
+ CloudTeacherOrder cloudTeacherOrder = new CloudTeacherOrder();
|
|
|
+ cloudTeacherOrder.setOrganId(musicGroup.getOrganId());
|
|
|
+ cloudTeacherOrder.setType(2);
|
|
|
+ cloudTeacherOrder.setTime(musicGroupPaymentCalender.getMemberValidDate());
|
|
|
+ cloudTeacherOrder.setAmount(expectMemberAmount);
|
|
|
+ cloudTeacherOrder.setStudentId(studentId);
|
|
|
+ cloudTeacherOrder.setLevel(musicGroupPaymentCalender.getMemberRankSettingId());
|
|
|
+ cloudTeacherOrder.setStatus(2);
|
|
|
+ cloudTeacherOrder.setStartTime(date);
|
|
|
+ cloudTeacherOrder.setEndTime(DateUtil.addMonths(date,musicGroupPaymentCalender.getMemberValidDate()));
|
|
|
+ cloudTeacherOrder.setRemark("缴费项目0元新增学员");
|
|
|
+ cloudTeacherOrder.setMusicGroupId(musicGroupId);
|
|
|
+ cloudTeacherOrderDao.insert(cloudTeacherOrder);
|
|
|
+ studentService.updateMemberRank(cloudTeacherOrder,PeriodEnum.MONTH);
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
if (musicGroupPaymentCalenderDetailList.size() > 0) {
|
zouxuan