|
|
@@ -534,12 +534,8 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
|
|
|
&& musicGroupPaymentBaseCalender.getMusicRepair() == null){
|
|
|
throw new BizException("请选择一个缴费项目");
|
|
|
}
|
|
|
- String musicGroupId = musicGroupPaymentBaseCalender.getMusicGroupId();
|
|
|
-
|
|
|
- PaymentType paymentType = musicGroupPaymentBaseCalender.getPaymentType();
|
|
|
-
|
|
|
- PayUserType payUserType = musicGroupPaymentBaseCalender.getPayUserType();
|
|
|
|
|
|
+ String musicGroupId = musicGroupPaymentBaseCalender.getMusicGroupId();
|
|
|
MusicGroup musicGroup = musicGroupDao.getLocked(musicGroupId);
|
|
|
if (musicGroup == null) {
|
|
|
throw new BizException("乐团查询失败，请检查参数");
|
|
|
@@ -574,7 +570,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
|
|
|
String batchNo = idGeneratorService.generatorId() + "";
|
|
|
|
|
|
BigDecimal originalMemberPaymentAmount = BigDecimal.ZERO;
|
|
|
- if (payUserType == SCHOOL) {
|
|
|
+ if (musicGroupPaymentBaseCalender.getPayUserType() == SCHOOL) {
|
|
|
status = AUDITING;
|
|
|
} else {
|
|
|
status = memberCalenderService.checkComponentAmount(musicGroupPaymentBaseCalender);
|
|
|
@@ -652,9 +648,9 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
|
|
|
// }
|
|
|
|
|
|
//缴费截止日期默认三天后
|
|
|
- if (musicGroupPaymentCalender.getDeadlinePaymentDate() == null && payUserType == PayUserType.STUDENT) {
|
|
|
- musicGroupPaymentCalender.setDeadlinePaymentDate(DateUtil.addDays(musicGroupPaymentCalender.getStartPaymentDate(), 3));
|
|
|
- }
|
|
|
+// if (musicGroupPaymentCalender.getDeadlinePaymentDate() == null && payUserType == PayUserType.STUDENT) {
|
|
|
+// musicGroupPaymentCalender.setDeadlinePaymentDate(DateUtil.addDays(musicGroupPaymentCalender.getStartPaymentDate(), 3));
|
|
|
+// }
|
|
|
|
|
|
if (musicGroupPaymentCalender.getStatus() != AUDITING) {
|
|
|
if (date.after(musicGroupPaymentCalender.getStartPaymentDate())) {
|
|
|
@@ -676,7 +672,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
|
|
|
musicGroupPaymentCalenderActivityService.batchInsert(musicGroupPaymentBaseCalender,musicGroupPaymentCalender.getId());
|
|
|
|
|
|
// 如果是报名，需要修改乐团状态
|
|
|
- if (paymentType == MUSIC_APPLY) {
|
|
|
+ if (musicGroupPaymentBaseCalender.getPaymentType() == MUSIC_APPLY) {
|
|
|
if (status != AUDITING) {
|
|
|
musicGroup.setStatus(MusicGroupStatusEnum.APPLY);
|
|
|
// 记录操作日志
|
zouxuan