|
@@ -1578,8 +1578,6 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
|
|
|
|
//删除续费周期
|
|
|
musicGroupStudentFeeDao.deleteByUserIdAndMusicGroupId(userId, musicGroupId);
|
|
|
- //删除缴费明细
|
|
|
- musicGroupPaymentCalenderDetailDao.deleteByUserIdAndMusicGroupId(userId, musicGroupId);
|
|
|
// 退团
|
|
|
studentRegistration.setMusicGroupStatus(StudentMusicGroupStatusEnum.QUIT);
|
|
|
studentRegistration.setUpdateTime(date);
|
|
@@ -1600,9 +1598,15 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
|
studentDao.update(student);
|
|
|
}
|
|
|
|
|
|
+
|
|
|
//删除用户购买的课程记录
|
|
|
musicGroupPaymentStudentCourseDetailDao.deleteByUserIdAndMusicGroupId(userId, musicGroupId);
|
|
|
|
|
|
+ //缴费项目预计人数减一
|
|
|
+ musicGroupPaymentCalenderDao.cutCalenderExpectNum(userId, musicGroupId);
|
|
|
+ //删除缴费项目详情
|
|
|
+ musicGroupPaymentCalenderDetailDao.deleteByUserIdAndMusicGroupId(userId, musicGroupId);
|
|
|
+
|
|
|
//操作人
|
|
|
SysUser operator = sysUserFeignService.queryUserInfo();
|
|
|
|
|
@@ -1754,6 +1758,11 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
|
//删除用户购买的课程记录
|
|
|
musicGroupPaymentStudentCourseDetailDao.deleteByUserIdAndMusicGroupId(userId, musicGroupId);
|
|
|
|
|
|
+ //缴费项目预计人数减一
|
|
|
+ musicGroupPaymentCalenderDao.cutCalenderExpectNum(userId, musicGroupId);
|
|
|
+ //删除缴费项目详情
|
|
|
+ musicGroupPaymentCalenderDetailDao.deleteByUserIdAndMusicGroupId(userId, musicGroupId);
|
|
|
+
|
|
|
//操作人
|
|
|
SysUser operator = sysUserFeignService.queryUserInfo();
|
|
|
|
|
@@ -1834,16 +1843,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
|
sysUserCashAccountDetailService.addCashAccountDetail(userId, amount, SysUserCashAccountDetailService.MUSIC_GROUP + musicGroupId, "",
|
|
|
PlatformCashAccountDetailTypeEnum.REFUNDS, null, SUCCESS, "退出乐团", null);
|
|
|
}
|
|
|
-
|
|
|
- //缴费项目预计人数减一
|
|
|
- musicGroupPaymentCalenderDao.cutCalenderExpectNum(userId, musicGroupId);
|
|
|
- //删除缴费项目
|
|
|
- List<Long> calenderIds = musicGroupPaymentCalenderDao.findStudentNoPaymentCalender(userId, musicGroupId);
|
|
|
- //删除缴费项目详情
|
|
|
- musicGroupPaymentCalenderDetailDao.deleteByUserIdAndMusicGroupId(userId, musicGroupId);
|
|
|
- if (calenderIds != null && calenderIds.size() > 0) {
|
|
|
- musicGroupPaymentCalenderDao.delByIds(calenderIds);
|
|
|
- }
|
|
|
+
|
|
|
return true;
|
|
|
}
|
|
|
|