|
|
@@ -582,6 +582,8 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
|
|
|
// musicGroupPaymentCalenderCourseSettingsList = new ArrayList<>();
|
|
|
// }
|
|
|
|
|
|
+ //会员原价
|
|
|
+ BigDecimal memberPaymentAmount = BigDecimal.ZERO;
|
|
|
if (payUserType == SCHOOL) {
|
|
|
status = AUDITING;
|
|
|
} else {
|
|
|
@@ -662,13 +664,12 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
|
|
|
musicGroupPaymentCalenderStudentDetailDao.batchInsert(calenderStudentDetails,batchNo);
|
|
|
}
|
|
|
}
|
|
|
- if(status != AUDITING && musicGroupPaymentCalenderDto.getMemberRankSettingId() != null){
|
|
|
+ if(musicGroupPaymentCalenderDto.getMemberRankSettingId() != null){
|
|
|
//会员价格是否变动
|
|
|
MemberFeeSetting memberFee = memberFeeSettingDao.findByRankIdAndOrganId(musicGroup.getOrganId(), musicGroupPaymentCalenderDto.getMemberRankSettingId());
|
|
|
if(memberFee == null){
|
|
|
throw new BizException("操作失败：请配置当前分部会员收费标准");
|
|
|
}
|
|
|
- BigDecimal memberPaymentAmount;
|
|
|
switch (musicGroupPaymentCalenderDto.getMemberValidDate()){
|
|
|
case 1 :
|
|
|
memberPaymentAmount = memberFee.getCurrentMonthFee();
|
|
|
@@ -706,6 +707,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
|
|
|
MusicGroupPaymentCalender musicGroupPaymentCalender = new MusicGroupPaymentCalender();
|
|
|
musicGroupPaymentCalender.setAttribute1(musicGroupPaymentCalenderDto.getAttribute1());
|
|
|
musicGroupPaymentCalender.setAttribute2(musicGroupPaymentCalenderDto.getAttribute2());
|
|
|
+ musicGroupPaymentCalender.setOriginalMemberPaymentAmount(memberPaymentAmount);
|
|
|
musicGroupPaymentCalender.setDeadlinePaymentDate(musicGroupPaymentDateRange.getDeadlinePaymentDate());
|
|
|
musicGroupPaymentCalender.setIsGiveMusicNetwork(musicGroupPaymentCalenderDto.getIsGiveMusicNetwork());
|
|
|
musicGroupPaymentCalender.setMemo(musicGroupPaymentCalenderDto.getMemo());
|
zouxuan